diff options
1240 files changed, 29957 insertions, 15822 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f8278d1cbe48c..59348b7b27aa6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -61,7 +61,7 @@ /pkgs/build-support/writers @lassulus @Profpatsch # Nixpkgs make-disk-image -/doc/builders/images/makediskimage.section.md @raitobezarius +/doc/build-helpers/images/makediskimage.section.md @raitobezarius /nixos/lib/make-disk-image.nix @raitobezarius # Nixpkgs documentation @@ -219,7 +219,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/knot.nix @mweinelt # Web servers -/doc/builders/packages/nginx.section.md @raitobezarius +/doc/packages/nginx.section.md @raitobezarius /pkgs/servers/http/nginx/ @raitobezarius /nixos/modules/services/web-servers/nginx/ @raitobezarius @@ -272,7 +272,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Docker tools /pkgs/build-support/docker @roberth /nixos/tests/docker-tools* @roberth -/doc/builders/images/dockertools.section.md @roberth +/doc/build-helpers/images/dockertools.section.md @roberth # Blockchains /pkgs/applications/blockchains @mmahut @RaghavSood diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 50562bd9310b1..2e9e20331bf68 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v2.0.0 + uses: korthout/backport-action@v2.1.0 with: # Config README: https://github.com/korthout/backport-action#backport-action copy_labels_pattern: 'severity:\ssecurity' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 06b9c10dfec6f..dadda215b0df7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -352,8 +352,8 @@ In a case a contributor definitively leaves the Nix community, they should creat # Flow of merged pull requests -After a pull requests is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/). -Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](http://channels.nixos.org/) when specific Hydra jobs succeeded. +After a pull request is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/). +Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](https://channels.nixos.org/) when specific Hydra jobs succeeded. See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state. Here's a brief overview of the main Git branches and what channels they're used for: diff --git a/doc/build-helpers.md b/doc/build-helpers.md new file mode 100644 index 0000000000000..06737e1667602 --- /dev/null +++ b/doc/build-helpers.md @@ -0,0 +1,28 @@ +# Build helpers {#part-builders} + +A build helper is a function that produces derivations. + +:::{.warning} +This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable. +::: + +Such a function is usually designed to abstract over a typical workflow for a given programming language or framework. +This allows declaring a build recipe by setting a limited number of options relevant to the particular use case instead of using the `derivation` function directly. + +[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper, and serves as a basis for many others. +In addition, it offers various options to customize parts of the builds. + +There is no uniform interface for build helpers. +[Trivial build helpers](#chap-trivial-builders) and [fetchers](#chap-pkgs-fetchers) have various input types for convenience. +[Language- or framework-specific build helpers](#chap-language-support) usually follow the style of `stdenv.mkDerivation`, which accepts an attribute set or a fixed-point function taking an attribute set. + +```{=include=} chapters +build-helpers/fetchers.chapter.md +build-helpers/trivial-build-helpers.chapter.md +build-helpers/testers.chapter.md +build-helpers/special.md +build-helpers/images.md +hooks/index.md +languages-frameworks/index.md +packages/index.md +``` diff --git a/doc/builders/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 7bd1bbd6de029..7bd1bbd6de029 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md diff --git a/doc/builders/images.md b/doc/build-helpers/images.md index 5596784bfa487..5596784bfa487 100644 --- a/doc/builders/images.md +++ b/doc/build-helpers/images.md diff --git a/doc/builders/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index 0c72315a26e88..0c72315a26e88 100644 --- a/doc/builders/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md diff --git a/doc/builders/images/binarycache.section.md b/doc/build-helpers/images/binarycache.section.md index 62e47dad7c66f..62e47dad7c66f 100644 --- a/doc/builders/images/binarycache.section.md +++ b/doc/build-helpers/images/binarycache.section.md diff --git a/doc/builders/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 42d6e297f529c..42d6e297f529c 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md diff --git a/doc/builders/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index e50479c4e83e4..e50479c4e83e4 100644 --- a/doc/builders/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md diff --git a/doc/builders/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index c35f65bce0073..c35f65bce0073 100644 --- a/doc/builders/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md diff --git a/doc/builders/images/portableservice.section.md b/doc/build-helpers/images/portableservice.section.md index 5400928b158f8..5400928b158f8 100644 --- a/doc/builders/images/portableservice.section.md +++ b/doc/build-helpers/images/portableservice.section.md diff --git a/doc/builders/images/snaptools.section.md b/doc/build-helpers/images/snaptools.section.md index 259fa1b061808..259fa1b061808 100644 --- a/doc/builders/images/snaptools.section.md +++ b/doc/build-helpers/images/snaptools.section.md diff --git a/doc/builders/special.md b/doc/build-helpers/special.md index 6d07fa87f3f3e..f88648207fdcd 100644 --- a/doc/builders/special.md +++ b/doc/build-helpers/special.md @@ -1,11 +1,10 @@ -# Special builders {#chap-special} +# Special build helpers {#chap-special} -This chapter describes several special builders. +This chapter describes several special build helpers. ```{=include=} sections special/fhs-environments.section.md special/makesetuphook.section.md special/mkshell.section.md -special/darwin-builder.section.md special/vm-tools.section.md ``` diff --git a/doc/builders/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index 8145fbd730f7e..8145fbd730f7e 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md diff --git a/doc/builders/special/makesetuphook.section.md b/doc/build-helpers/special/makesetuphook.section.md index eb042412137b8..e83164b7eb701 100644 --- a/doc/builders/special/makesetuphook.section.md +++ b/doc/build-helpers/special/makesetuphook.section.md @@ -1,6 +1,6 @@ # pkgs.makeSetupHook {#sec-pkgs.makeSetupHook} -`pkgs.makeSetupHook` is a builder that produces hooks that go in to `nativeBuildInputs` +`pkgs.makeSetupHook` is a build helper that produces hooks that go in to `nativeBuildInputs` ## Usage {#sec-pkgs.makeSetupHook-usage} diff --git a/doc/builders/special/mkshell.section.md b/doc/build-helpers/special/mkshell.section.md index 96d43535955fa..96d43535955fa 100644 --- a/doc/builders/special/mkshell.section.md +++ b/doc/build-helpers/special/mkshell.section.md diff --git a/doc/builders/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 8feab04902d8f..8feab04902d8f 100644 --- a/doc/builders/special/vm-tools.section.md +++ b/doc/build-helpers/special/vm-tools.section.md diff --git a/doc/builders/testers.chapter.md b/doc/build-helpers/testers.chapter.md index b2a581c3dd8d9..b2a581c3dd8d9 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md diff --git a/doc/builders/trivial-builders.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 2cb1f2debcb8e..a0cda86a66071 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -1,4 +1,4 @@ -# Trivial builders {#chap-trivial-builders} +# Trivial build helpers {#chap-trivial-builders} Nixpkgs provides a couple of functions that help with building derivations. The most important one, `stdenv.mkDerivation`, has already been documented above. The following functions wrap `stdenv.mkDerivation`, making it easier to use in certain cases. diff --git a/doc/builders.md b/doc/builders.md deleted file mode 100644 index 2e959422405b2..0000000000000 --- a/doc/builders.md +++ /dev/null @@ -1,12 +0,0 @@ -# Builders {#part-builders} - -```{=include=} chapters -builders/fetchers.chapter.md -builders/trivial-builders.chapter.md -builders/testers.chapter.md -builders/special.md -builders/images.md -hooks/index.md -languages-frameworks/index.md -builders/packages/index.md -``` diff --git a/doc/functions/fileset.section.md b/doc/functions/fileset.section.md index 08b9ba9eaedc0..c42337feaba4f 100644 --- a/doc/functions/fileset.section.md +++ b/doc/functions/fileset.section.md @@ -6,11 +6,8 @@ The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work w A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. -These sections apply to the entire library. See the [function reference](#sec-functions-library-fileset) for function-specific documentation. -The file set library is currently somewhat limited but is being expanded to include more functions over time. - ## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. diff --git a/doc/hooks/autopatchelf.section.md b/doc/hooks/autopatchelf.section.md index 008a90d46140c..995204b902199 100644 --- a/doc/hooks/autopatchelf.section.md +++ b/doc/hooks/autopatchelf.section.md @@ -6,6 +6,6 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. -By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies. +By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to `[ "*" ]` to ignore all missing dependencies. The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index ff3d70ef0c626..cb1f12eec234a 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -146,7 +146,7 @@ agdaPackages.mkDerivation { ### Building Agda packages {#building-agda-packages} -The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. +The default build phase for `agdaPackages.mkDerivation` runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. @@ -250,7 +250,7 @@ Usually, the maintainers will answer within a week or two with a new release. Bumping the version of that reverse dependency should be a further commit on your PR. In the rare case that a new release is not to be expected within an acceptable time, -simply mark the broken package as broken by setting `meta.broken = true;`. +mark the broken package as broken by setting `meta.broken = true;`. This will exclude it from the build test. It can be added later when it is fixed, and does not hinder the advancement of the whole package set in the meantime. diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 2cb4863fc53be..1e83d4b93c7c5 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -44,7 +44,7 @@ There is also a `buildMix` helper, whose behavior is closer to that of `buildErl ## How to Install BEAM Packages {#how-to-install-beam-packages} -BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. +BEAM builders are not registered at the top level, because they are not relevant to the vast majority of Nix users. To use any of those builders into your environment, refer to them by their attribute path under `beamPackages`, e.g. `beamPackages.rebar3`: ::: {.example #ex-beam-ephemeral-shell} diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index 8d9c062f4220f..9da43714a164d 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -8,7 +8,7 @@ It fetches its Dart dependencies automatically through `fetchDartDeps`, and (thr If you are packaging a Flutter desktop application, use [`buildFlutterApplication`](#ssec-dart-flutter) instead. -`vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, simply set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). +`vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). 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. diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 6b9ce32d17362..b0b5f5c3bb2f1 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -177,7 +177,7 @@ exactly one version. Those versions need to satisfy all the version constraints given in the `.cabal` file of your package and all its dependencies. The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing. -It will simply take as input packages with names off the desired dependencies +It will take as input packages with names off the desired dependencies and just check whether they fulfill the version bounds and fail if they don’t (by default, see `jailbreak` to circumvent this). @@ -780,7 +780,7 @@ there instead. The top level `pkgs.haskell-language-server` attribute is just a convenience wrapper to make it possible to install HLS for multiple GHC versions at the same time. If you know, that you only use one GHC version, e.g., in a project -specific `nix-shell` you can simply use +specific `nix-shell` you can use `pkgs.haskellPackages.haskell-language-server` or `pkgs.haskell.packages.*.haskell-language-server` from the package set you use. diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index f35fd83cc5949..79cb09572503b 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -209,6 +209,7 @@ In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json * `npmPackFlags`: Flags to pass to `npm pack`. * `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`. * `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`. +* `nodejs`: The `nodejs` package to build against, using the corresponding `npm` shipped with that version of `node`. Defaults to `pkgs.nodejs`. #### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps} diff --git a/doc/languages-frameworks/lisp.section.md b/doc/languages-frameworks/lisp.section.md index 8712c34120645..09193093b08fa 100644 --- a/doc/languages-frameworks/lisp.section.md +++ b/doc/languages-frameworks/lisp.section.md @@ -66,7 +66,7 @@ buildPhase = '' To save some work of writing Nix expressions, there is a script that imports all the packages distributed by Quicklisp into `imported.nix`. This works by parsing its `releases.txt` and `systems.txt` files, which are published every couple of -months on [quicklisp.org](http://beta.quicklisp.org/dist/quicklisp.txt). +months on [quicklisp.org](https://beta.quicklisp.org/dist/quicklisp.txt). The import process is implemented in the `import` directory as Common Lisp code in the `org.lispbuilds.nix` ASDF system. To run the script, one can @@ -268,7 +268,7 @@ getting an environment variable for `ext:getenv`. This will load the ### Loading systems {#lisp-loading-systems} -There, you can simply use `asdf:load-system`. This works by setting the right +There, you can use `asdf:load-system`. This works by setting the right values for the `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` environment variables, so that systems are found in the Nix store and pre-compiled FASLs are loaded. diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 7e287a097c7e0..b86733a758984 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -53,7 +53,7 @@ After setting `maven.buildMavenPackage`, we then do standard Java `.jar` install Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash. -When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will simply be built on the derivation of old plugins, and fail because the requested plugins are missing. +When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will be built on the derivation of old plugins, and fail because the requested plugins are missing. This clearly prevents automatic upgrades of Maven: a manual effort must be made throughout nixpkgs by any maintainer wishing to push the upgrades. diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 377e3947b2a29..154d8174f9aaf 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -58,7 +58,7 @@ php.withExtensions ({ enabled, all }: ++ [ all.imagick ]) ``` -To build your list of extensions from the ground up, you can simply +To build your list of extensions from the ground up, you can ignore `enabled`: ```nix @@ -140,7 +140,7 @@ Example of building `composer` with additional extensions: ### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} `php-packages.nix` form a scope, allowing us to override the packages defined -within. For example, to apply a patch to a `mysqlnd` extension, you can simply +within. For example, to apply a patch to a `mysqlnd` extension, you can pass an overlay-style function to `php`’s `packageOverrides` argument: ```nix @@ -191,7 +191,7 @@ using the `bin` attribute in `composer.json`, these binaries will be automatically linked and made accessible in the derivation. In this context, "binaries" refer to PHP scripts that are intended to be executable. -To use the helper effectively, simply add the `vendorHash` attribute, which +To use the helper effectively, add the `vendorHash` attribute, which enables the wrapper to handle the heavy lifting. Internally, the helper operates in three stages: diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index cdd5c806912e1..19d4496eef516 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -9,8 +9,8 @@ | python27 | python2, python | CPython 2.7 | | python38 | | CPython 3.8 | | python39 | | CPython 3.9 | -| python310 | python3 | CPython 3.10 | -| python311 | | CPython 3.11 | +| python310 | | CPython 3.10 | +| python311 | python3 | CPython 3.11 | | python312 | | CPython 3.12 | | python313 | | CPython 3.13 | | pypy27 | pypy2, pypy | PyPy2.7 | @@ -64,12 +64,14 @@ sets are * `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` +* `pkgs.python312Packages` +* `pkgs.python313Packages` * `pkgs.pypyPackages` and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python310Packages` +* `pkgs.python3Packages` pointing to `pkgs.python311Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function {#buildpythonpackage-function} @@ -142,7 +144,7 @@ buildPythonPackage rec { The `buildPythonPackage` mainly does four things: -* In the [`buildPhase`](#build-phase), it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to +* In the [`buildPhase`](#build-phase), it calls `${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. * In the [`installPhase`](#ssec-install-phase), it installs the wheel file using `pip install *.whl`. * In the [`postFixup`](#var-stdenv-postFixup) phase, the `wrapPythonPrograms` bash function is called to @@ -262,7 +264,7 @@ python3MyBlas = pkgs.python3.override { ``` This is particularly useful for numpy and scipy users who want to gain speed with other blas implementations. -Note that using simply `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in +Note that using `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in compilation issues, because scipy dependencies need to use the same blas implementation as well. #### `buildPythonApplication` function {#buildpythonapplication-function} @@ -278,16 +280,16 @@ the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. When packaging a Python application with [`buildPythonApplication`](#buildpythonapplication-function), it should be -called with `callPackage` and passed `python` or `pythonPackages` (possibly +called with `callPackage` and passed `python3` or `python3Packages` (possibly specifying an interpreter version), like this: ```nix { lib -, python3 +, python3Packages , fetchPypi }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "luigi"; version = "2.7.9"; pyproject = true; @@ -298,13 +300,13 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel + python3Packages.setuptools + python3Packages.wheel ]; - propagatedBuildInputs = with python3.pkgs; [ - tornado - python-daemon + propagatedBuildInputs = [ + python3Packages.tornado + python3Packages.python-daemon ]; meta = with lib; { @@ -320,7 +322,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; ``` Since the package is an application, a consumer doesn't need to care about -Python versions or modules, which is why they don't go in `pythonPackages`. +Python versions or modules, which is why they don't go in `python3Packages`. #### `toPythonApplication` function {#topythonapplication-function} @@ -336,7 +338,7 @@ the attribute in `python-packages.nix`, and the `toPythonApplication` shall be applied to the reference: ```nix -youtube-dl = with pythonPackages; toPythonApplication youtube-dl; +youtube-dl = with python3Packages; toPythonApplication youtube-dl; ``` #### `toPythonModule` function {#topythonmodule-function} @@ -365,8 +367,8 @@ Saving the following as `default.nix` ```nix with import <nixpkgs> {}; -python.buildEnv.override { - extraLibs = [ pythonPackages.pyramid ]; +python3.buildEnv.override { + extraLibs = [ python3Packages.pyramid ]; ignoreCollisions = true; } ``` @@ -431,7 +433,7 @@ python3.withPackages (ps: [ ps.pyramid ]) Now, `ps` is set to `python3Packages`, matching the version of the interpreter. -As [`python.withPackages`](#python.withpackages-function) simply uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also +As [`python.withPackages`](#python.withpackages-function) uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: @@ -496,9 +498,9 @@ Given a `default.nix`: ```nix with import <nixpkgs> {}; -pythonPackages.buildPythonPackage { +python3Packages.buildPythonPackage { name = "myproject"; - buildInputs = with pythonPackages; [ pyramid ]; + buildInputs = with python3Packages; [ pyramid ]; src = ./.; } @@ -510,7 +512,7 @@ the package would be built with `nix-build`. Shortcut to setup environments with C headers/libraries and Python packages: ```shell -nix-shell -p pythonPackages.pyramid zlib libjpeg git +nix-shell -p python3Packages.pyramid zlib libjpeg git ``` ::: {.note} @@ -525,7 +527,7 @@ There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.10. The attribute `python` refers to +interpreter, which is currently CPython 3.11. The attribute `python` refers to CPython 2.7 for backwards-compatibility. It is also possible to refer to specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to the default PyPy interpreter. @@ -543,7 +545,7 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. +is `python3.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. `pythonPackages` refers to `python.pkgs` and `python311Packages` to `python311.pkgs`. @@ -680,7 +682,7 @@ b = np.array([3,4]) print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -Then we simply execute it, without requiring any environment setup at all! +Then we execute it, without requiring any environment setup at all! ```sh $ ./foo.py @@ -1682,7 +1684,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: ```shell -${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out +${python.pythonOnBuildForHost.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data\_files/d' setup.py ``` @@ -1711,7 +1713,7 @@ This is an example of a `default.nix` for a `nix-shell`, which allows to consume a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. -Create this `default.nix` file, together with a `requirements.txt` and simply +Create this `default.nix` file, together with a `requirements.txt` and execute `nix-shell`. ```nix @@ -1835,7 +1837,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul }; ``` -`pythonPackages.twisted` is now globally overridden. +`python3Packages.twisted` is now globally overridden. All packages and also all NixOS services that reference `twisted` (such as `services.buildbot-worker`) now use the new definition. Note that `python-super` refers to the old package set and `python-self` @@ -1845,7 +1847,7 @@ To modify only a Python package set instead of a whole Python derivation, use this snippet: ```nix - myPythonPackages = pythonPackages.override { + myPythonPackages = python3Packages.override { overrides = self: super: { twisted = ...; }; @@ -2025,7 +2027,9 @@ The following rules are desired to be respected: disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why. * Commit names of Python libraries should reflect that they are Python - libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`. + libraries, so write for example `python311Packages.numpy: 1.11 -> 1.12`. + It is highly recommended to specify the current default version to enable + automatic build by ofborg. * Attribute names in `python-packages.nix` as well as `pname`s should match the library's name on PyPI, but be normalized according to [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index d3b896686c067..920c84eee689c 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -94,7 +94,7 @@ $ bundle lock $ bundix ``` -If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same. +If you already have a `Gemfile.lock`, you can run `bundix` and it will work the same. To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification. @@ -251,7 +251,7 @@ source 'https://rubygems.org' do end ``` -If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. +If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by running the `bundle lock` and `bundix` steps again. Now you can also make a `default.nix` that looks like this: diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md index 1cc452cc9b9bf..213d444f499fa 100644 --- a/doc/languages-frameworks/swift.section.md +++ b/doc/languages-frameworks/swift.section.md @@ -32,7 +32,7 @@ look for the following directories: (If not targeting macOS, replace `macosx` with the Xcode platform name.) - On other platforms: `lib/swift/linux/x86_64` (Where `linux` and `x86_64` are from lowercase `uname -sm`.) -- For convenience, Nixpkgs also adds simply `lib/swift` to the search path. +- For convenience, Nixpkgs also adds `lib/swift` to the search path. This can save a bit of work packaging Swift modules, because many Nix builds will produce output for just one target any way. @@ -123,7 +123,7 @@ swiftpmFlags = [ "--disable-dead-strip" ]; The default `buildPhase` already passes `-j` for parallel building. -If these two customization options are insufficient, simply provide your own +If these two customization options are insufficient, provide your own `buildPhase` that invokes `swift build`. ### Running tests {#ssec-swiftpm-running-tests} diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 777e94c16f18b..2ba846dc492d9 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -2,6 +2,46 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`. +## User's guide (experimental new interface) {#sec-language-texlive-user-guide-experimental} + +Release 23.11 ships with a new interface that will eventually replace `texlive.combine`. + +- For basic usage, use some of the prebuilt environments available at the top level, such as `texliveBasic`, `texliveSmall`. For the full list of prebuilt environments, inspect `texlive.schemes`. + +- Packages cannot be used directly but must be assembled in an environment. To create or add packages to an environment, use + ```nix + texliveSmall.withPackages (ps: with ps; [ collection-langkorean algorithms cm-super ]) + ``` + The function `withPackages` can be called multiple times to add more packages. + + - **Note.** Within Nixpkgs, packages should only use prebuilt environments as inputs, such as `texliveSmall` or `texliveInfraOnly`, and should not depend directly on `texlive`. Further dependencies should be added by calling `withPackages`. This is to ensure that there is a consistent and simple way to override the inputs. + +- `texlive.withPackages` uses the same logic as `buildEnv`. Only parts of a package are installed in an environment: its 'runtime' files (`tex` output), binaries (`out` output), and support files (`tlpkg` output). Moreover, man and info pages are assembled into separate `man` and `info` outputs. To add only the TeX files of a package, or its documentation (`texdoc` output), just specify the outputs: + ```nix + texlive.withPackages (ps: with ps; [ + texdoc # recommended package to navigate the documentation + perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries + cm-super + cm-super.texdoc # documentation of cm-super + ]) + ``` + +- All packages distributed by TeX Live, which contains most of CTAN, are available and can be found under `texlive.pkgs`: + ```ShellSession + $ nix repl + nix-repl> :l <nixpkgs> + nix-repl> texlive.pkgs.[TAB] + ``` + Note that the packages in `texlive.pkgs` are only provided for search purposes and must not be used directly. + +- **Experimental and subject to change without notice:** to add the documentation for all packages in the environment, use + ```nix + texliveSmall.__overrideTeXConfig { withDocs = true; } + ``` + This can be applied before or after calling `withPackages`. + + The function currently support the parameters `withDocs`, `withSources`, and `requireTeXPackages`. + ## User's guide {#sec-language-texlive-user-guide} - For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. diff --git a/doc/manual.md.in b/doc/manual.md.in index 6b8d351380f95..52971ff526c28 100644 --- a/doc/manual.md.in +++ b/doc/manual.md.in @@ -9,7 +9,7 @@ preface.chapter.md using-nixpkgs.md lib.md stdenv.md -builders.md +build-helpers.md development.md contributing.md ``` diff --git a/doc/builders/packages/cataclysm-dda.section.md b/doc/packages/cataclysm-dda.section.md index f401e9b9efa53..f401e9b9efa53 100644 --- a/doc/builders/packages/cataclysm-dda.section.md +++ b/doc/packages/cataclysm-dda.section.md diff --git a/doc/builders/packages/citrix.section.md b/doc/packages/citrix.section.md index bcf0924249bce..bcf0924249bce 100644 --- a/doc/builders/packages/citrix.section.md +++ b/doc/packages/citrix.section.md diff --git a/doc/builders/special/darwin-builder.section.md b/doc/packages/darwin-builder.section.md index e37fabe01a353..89c2445667dcc 100644 --- a/doc/builders/special/darwin-builder.section.md +++ b/doc/packages/darwin-builder.section.md @@ -1,10 +1,10 @@ # darwin.linux-builder {#sec-darwin-builder} -`darwin.linux-builder` provides a way to bootstrap a Linux builder on a macOS machine. +`darwin.linux-builder` provides a way to bootstrap a Linux remote builder on a macOS machine. This requires macOS version 12.4 or later. -The builder runs on host port 31022 by default. +The remote builder runs on host port 31022 by default. You can change it by overriding `virtualisation.darwin-builder.hostPort`. See the [example](#sec-darwin-builder-example-flake). @@ -15,7 +15,7 @@ words, your `/etc/nix/nix.conf` should have something like: extra-trusted-users = <your username goes here> ``` -To launch the builder, run the following flake: +To launch the remote builder, run the following flake: ```ShellSession $ nix run nixpkgs#darwin.linux-builder @@ -57,7 +57,7 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519 builders-use-substitutes = true ``` -To allow Nix to connect to a builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: +To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: ``` Host linux-builder @@ -130,11 +130,11 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon } ``` -## Reconfiguring the builder {#sec-darwin-builder-reconfiguring} +## Reconfiguring the remote builder {#sec-darwin-builder-reconfiguring} -Initially you should not change the builder configuration else you will not be -able to use the binary cache. However, after you have the builder running locally -you may use it to build a modified builder with additional storage or memory. +Initially you should not change the remote builder configuration else you will not be +able to use the binary cache. However, after you have the remote builder running locally +you may use it to build a modified remote builder with additional storage or memory. To do this, you just need to set the `virtualisation.darwin-builder.*` parameters as in the example below and rebuild. diff --git a/doc/builders/packages/dlib.section.md b/doc/packages/dlib.section.md index bd5b1a20a4d46..bd5b1a20a4d46 100644 --- a/doc/builders/packages/dlib.section.md +++ b/doc/packages/dlib.section.md diff --git a/doc/builders/packages/eclipse.section.md b/doc/packages/eclipse.section.md index e19510e131a09..e19510e131a09 100644 --- a/doc/builders/packages/eclipse.section.md +++ b/doc/packages/eclipse.section.md diff --git a/doc/builders/packages/elm.section.md b/doc/packages/elm.section.md index 063dd73d9de43..063dd73d9de43 100644 --- a/doc/builders/packages/elm.section.md +++ b/doc/packages/elm.section.md diff --git a/doc/builders/packages/emacs.section.md b/doc/packages/emacs.section.md index c50c7815537dc..c50c7815537dc 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/packages/emacs.section.md diff --git a/doc/builders/packages/etc-files.section.md b/doc/packages/etc-files.section.md index 94a769ed33555..94a769ed33555 100644 --- a/doc/builders/packages/etc-files.section.md +++ b/doc/packages/etc-files.section.md diff --git a/doc/builders/packages/firefox.section.md b/doc/packages/firefox.section.md index 46bc0457a3dc2..46bc0457a3dc2 100644 --- a/doc/builders/packages/firefox.section.md +++ b/doc/packages/firefox.section.md diff --git a/doc/builders/packages/fish.section.md b/doc/packages/fish.section.md index 85b57acd1090f..85b57acd1090f 100644 --- a/doc/builders/packages/fish.section.md +++ b/doc/packages/fish.section.md diff --git a/doc/builders/packages/fuse.section.md b/doc/packages/fuse.section.md index 6deea6b5626ed..6deea6b5626ed 100644 --- a/doc/builders/packages/fuse.section.md +++ b/doc/packages/fuse.section.md diff --git a/doc/builders/packages/ibus.section.md b/doc/packages/ibus.section.md index 817e55d56f1f9..817e55d56f1f9 100644 --- a/doc/builders/packages/ibus.section.md +++ b/doc/packages/ibus.section.md diff --git a/doc/builders/packages/index.md b/doc/packages/index.md index 1f44357024064..1f45018ffc4a0 100644 --- a/doc/builders/packages/index.md +++ b/doc/packages/index.md @@ -4,6 +4,7 @@ This chapter contains information about how to use and maintain the Nix expressi ```{=include=} sections citrix.section.md +darwin-builder.section.md dlib.section.md eclipse.section.md elm.section.md diff --git a/doc/builders/packages/kakoune.section.md b/doc/packages/kakoune.section.md index 8e054777a7578..8e054777a7578 100644 --- a/doc/builders/packages/kakoune.section.md +++ b/doc/packages/kakoune.section.md diff --git a/doc/builders/packages/linux.section.md b/doc/packages/linux.section.md index b64da85791a0d..b64da85791a0d 100644 --- a/doc/builders/packages/linux.section.md +++ b/doc/packages/linux.section.md diff --git a/doc/builders/packages/locales.section.md b/doc/packages/locales.section.md index 3a983f13a396e..3a983f13a396e 100644 --- a/doc/builders/packages/locales.section.md +++ b/doc/packages/locales.section.md diff --git a/doc/builders/packages/nginx.section.md b/doc/packages/nginx.section.md index 0704b534e5f72..0704b534e5f72 100644 --- a/doc/builders/packages/nginx.section.md +++ b/doc/packages/nginx.section.md diff --git a/doc/builders/packages/opengl.section.md b/doc/packages/opengl.section.md index f4d282267a079..f4d282267a079 100644 --- a/doc/builders/packages/opengl.section.md +++ b/doc/packages/opengl.section.md diff --git a/doc/builders/packages/shell-helpers.section.md b/doc/packages/shell-helpers.section.md index e7c2b0abebfca..e7c2b0abebfca 100644 --- a/doc/builders/packages/shell-helpers.section.md +++ b/doc/packages/shell-helpers.section.md diff --git a/doc/builders/packages/steam.section.md b/doc/packages/steam.section.md index 25728aa52aef0..a1e88b0d97103 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/packages/steam.section.md @@ -11,7 +11,7 @@ Nix problems and constraints: - The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam. - The steam binary cannot be patched, it's also checked. -The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. +The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](https://sandervanderburg.blogspot.com/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. ## How to play {#sec-steam-play} diff --git a/doc/builders/packages/urxvt.section.md b/doc/packages/urxvt.section.md index 507feaa6fd861..7aff0997dd2b4 100644 --- a/doc/builders/packages/urxvt.section.md +++ b/doc/packages/urxvt.section.md @@ -34,7 +34,7 @@ $ nix repl map (p: p.name) pkgs.rxvt-unicode.plugins ``` -Alternatively, if your shell is bash or zsh and have completion enabled, simply type `nixpkgs.rxvt-unicode.plugins.<tab>`. +Alternatively, if your shell is bash or zsh and have completion enabled, type `nixpkgs.rxvt-unicode.plugins.<tab>`. In addition to `plugins` the options `extraDeps` and `perlDeps` can be used to install extra packages. `extraDeps` can be used, for example, to provide `xsel` (a clipboard manager) to the clipboard plugin, without installing it globally: diff --git a/doc/builders/packages/weechat.section.md b/doc/packages/weechat.section.md index 755b6e6ad1ea4..755b6e6ad1ea4 100644 --- a/doc/builders/packages/weechat.section.md +++ b/doc/packages/weechat.section.md diff --git a/doc/builders/packages/xorg.section.md b/doc/packages/xorg.section.md index ae885f9234677..ae885f9234677 100644 --- a/doc/builders/packages/xorg.section.md +++ b/doc/packages/xorg.section.md diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 1dfe25f02654f..26c43bd9e943c 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,7 +319,7 @@ let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h ``` -This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information. +This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information. Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In the former case, the motivation for `mapOffset` is that since its host and target platforms are the same, no transitive dependency of it should be able to “discover” an offset greater than its reduced target offsets. `mapOffset` effectively “squashes” all its transitive dependencies’ offsets so that none will ever be greater than the target offset of the original `h = t` package. In the other case, `h + 1` is skipped over between the host and target offsets. Instead of squashing the offsets, we need to “rip” them apart so no transitive dependencies’ offset is that one. @@ -528,7 +528,7 @@ If the returned array contains exactly one object (e.g. `[{}]`), all values are ``` ::: -### Recursive attributes in `mkDerivation` {#mkderivation-recursive-attributes} +### Fixed-point arguments of `mkDerivation` {#mkderivation-recursive-attributes} If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example: @@ -649,7 +649,7 @@ Zip files are unpacked using `unzip`. However, `unzip` is not in the standard en #### Directories in the Nix store {#directories-in-the-nix-store} -These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. +These are copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. Additional file types can be supported by setting the `unpackCmd` variable (see below). @@ -788,7 +788,7 @@ Hook executed at the end of the configure phase. ### The build phase {#build-phase} -The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. +The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. #### Variables controlling the build phase {#variables-controlling-the-build-phase} @@ -1317,7 +1317,7 @@ Nix itself considers a build-time dependency as merely something that should pre In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. -The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. +The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper’s setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of `envBuildBuildHooks`, `envBuildHostHooks`, `envBuildTargetHooks`, `envHostHostHooks`, `envHostTargetHooks`, or `envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there’s 12 total but we ignore the propagated/non-propagated axis). diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 6ee52215a4e18..1bec6586f28e1 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default. -- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS) +- [LAPACK reference](https://www.netlib.org/lapack/) (also provides BLAS and CBLAS) The Nixpkgs attribute is `lapack-reference`. @@ -156,7 +156,7 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas - [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich` -To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay: +To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, use the following overlay: ```nix self: super: diff --git a/lib/asserts.nix b/lib/asserts.nix index 98e0b490acf29..8d0a621f4c1c2 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -50,4 +50,33 @@ rec { lib.generators.toPretty {} xs}, but is: ${ lib.generators.toPretty {} val}"; + /* Specialized `assertMsg` for checking if every one of `vals` is one of the elements + of the list `xs`. Useful for checking lists of supported attributes. + + Example: + let sslLibraries = [ "libressl" "bearssl" ]; + in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ] + stderr> error: each element in sslLibraries must be one of [ + stderr> "openssl" + stderr> "bearssl" + stderr> ], but is: [ + stderr> "libressl" + stderr> "bearssl" + stderr> ] + + Type: + assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool + */ + assertEachOneOf = + # The name of the variable the user entered `val` into, for inclusion in the error message + name: + # The list of values of what the user provided, to be compared against the values in `xs` + vals: + # The list of valid values + xs: + assertMsg + (lib.all (val: lib.elem val xs) vals) + "each element in ${name} must be one of ${ + lib.generators.toPretty {} xs}, but is: ${ + lib.generators.toPretty {} vals}"; } diff --git a/lib/fileset/README.md b/lib/fileset/README.md index 16ab58e2f2663..8518d88a7d642 100644 --- a/lib/fileset/README.md +++ b/lib/fileset/README.md @@ -244,5 +244,4 @@ Here's a list of places in the library that need to be updated in the future: - > The file set library is currently somewhat limited but is being expanded to include more functions over time. in [the manual](../../doc/functions/fileset.section.md) -- If/Once a function to convert `lib.sources` values into file sets exists, the `_coerce` and `toSource` functions should be updated to mention that function in the error when such a value is passed - If/Once a function exists that can optionally include a path depending on whether it exists, the error message for the path not existing in `_coerce` should mention the new function diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 4a97633b4a89d..372d445269f55 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -3,8 +3,10 @@ let inherit (import ./internal.nix { inherit lib; }) _coerce + _singleton _coerceMany _toSourceFilter + _fromSourceFilter _unionMany _fileFilter _printFileset @@ -122,11 +124,10 @@ in { Paths in [strings](https://nixos.org/manual/nix/stable/language/values.html#type-string), including Nix store paths, cannot be passed as `root`. `root` has to be a directory. -<!-- Ignore the indentation here, this is a nixdoc rendering bug that needs to be fixed: https://github.com/nix-community/nixdoc/issues/75 --> -:::{.note} -Changing `root` only affects the directory structure of the resulting store path, it does not change which files are added to the store. -The only way to change which files get added to the store is by changing the `fileset` attribute. -::: + :::{.note} + Changing `root` only affects the directory structure of the resulting store path, it does not change which files are added to the store. + The only way to change which files get added to the store is by changing the `fileset` attribute. + ::: */ root, /* @@ -135,10 +136,9 @@ The only way to change which files get added to the store is by changing the `fi This argument can also be a path, which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). -<!-- Ignore the indentation here, this is a nixdoc rendering bug that needs to be fixed: https://github.com/nix-community/nixdoc/issues/75 --> -:::{.note} -If a directory does not recursively contain any file, it is omitted from the store path contents. -::: + :::{.note} + If a directory does not recursively contain any file, it is omitted from the store path contents. + ::: */ fileset, @@ -154,9 +154,14 @@ If a directory does not recursively contain any file, it is omitted from the sto sourceFilter = _toSourceFilter fileset; in if ! isPath root then - if isStringLike root then + if root ? _isLibCleanSourceWith then throw '' - lib.fileset.toSource: `root` ("${toString root}") is a string-like value, but it should be a path instead. + lib.fileset.toSource: `root` is a `lib.sources`-based value, but it should be a path instead. + To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. + Note that this only works for sources created from paths.'' + else if isStringLike root then + throw '' + lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else throw '' @@ -165,13 +170,13 @@ If a directory does not recursively contain any file, it is omitted from the sto # See also ../path/README.md else if ! fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then throw '' - lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` ("${toString root}"): - `root`: root "${toString rootFilesystemRoot}" - `fileset`: root "${toString filesetFilesystemRoot}" - Different roots are not supported.'' + lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` (${toString root}): + `root`: Filesystem root is "${toString rootFilesystemRoot}" + `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" + Different filesystem roots are not supported.'' else if ! pathExists root then throw '' - lib.fileset.toSource: `root` (${toString root}) does not exist.'' + lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: @@ -191,6 +196,75 @@ If a directory does not recursively contain any file, it is omitted from the sto }; /* + Create a file set with the same files as a `lib.sources`-based value. + This does not import any of the files into the store. + + This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`. + + A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource). + + :::{.note} + File sets cannot represent empty directories. + Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories. + ::: + + Type: + fromSource :: SourceLike -> FileSet + + Example: + # There's no cleanSource-like function for file sets yet, + # but we can just convert cleanSource to a file set and use it that way + toSource { + root = ./.; + fileset = fromSource (lib.sources.cleanSource ./.); + } + + # Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`), + # but removing a subdirectory using file set functions + difference + (fromSource (lib.sources.sourceByRegex ./. [ + "^README\.md$" + # This regex includes everything in ./doc + "^doc(/.*)?$" + ]) + ./doc/generated + + # Use cleanSource, but limit it to only include ./Makefile and files under ./src + intersection + (fromSource (lib.sources.cleanSource ./.)) + (unions [ + ./Makefile + ./src + ]); + */ + fromSource = source: + let + # This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`, + # which are technically internal to lib.sources, + # but we'll allow this since both libraries are in the same code base + # and this function is a bridge between them. + isFiltered = source ? _isLibCleanSourceWith; + path = if isFiltered then source.origSrc else source; + in + # We can only support sources created from paths + if ! isPath path then + if isStringLike path then + throw '' + lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. + Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' + else + throw '' + lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' + else if ! pathExists path then + throw '' + lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.'' + else if isFiltered then + _fromSourceFilter path source.filter + else + # If there's no filter, no need to run the expensive conversion, all subpaths will be included + _singleton path; + + /* The file set containing all files that are in either of two given file sets. This is the same as [`unions`](#function-library-lib.fileset.unions), but takes just two file sets instead of a list. @@ -223,11 +297,11 @@ If a directory does not recursively contain any file, it is omitted from the sto _unionMany (_coerceMany "lib.fileset.union" [ { - context = "first argument"; + context = "First argument"; value = fileset1; } { - context = "second argument"; + context = "Second argument"; value = fileset2; } ]); @@ -269,12 +343,13 @@ If a directory does not recursively contain any file, it is omitted from the sto # which get [implicitly coerced to file sets](#sec-fileset-path-coercion). filesets: if ! isList filesets then - throw "lib.fileset.unions: Expected argument to be a list, but got a ${typeOf filesets}." + throw '' + lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors (imap0 (i: el: { - context = "element ${toString i}"; + context = "Element ${toString i}"; value = el; })) (_coerceMany "lib.fileset.unions") @@ -325,10 +400,11 @@ If a directory does not recursively contain any file, it is omitted from the sto # 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." + throw '' + lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function.'' else _fileFilter predicate - (_coerce "lib.fileset.fileFilter: second argument" fileset); + (_coerce "lib.fileset.fileFilter: Second argument" fileset); /* The file set containing all files that are in both of two given file sets. @@ -356,11 +432,11 @@ If a directory does not recursively contain any file, it is omitted from the sto let filesets = _coerceMany "lib.fileset.intersection" [ { - context = "first argument"; + context = "First argument"; value = fileset1; } { - context = "second argument"; + context = "Second argument"; value = fileset2; } ]; @@ -408,11 +484,11 @@ If a directory does not recursively contain any file, it is omitted from the sto let filesets = _coerceMany "lib.fileset.difference" [ { - context = "first argument (positive set)"; + context = "First argument (positive set)"; value = positive; } { - context = "second argument (negative set)"; + context = "Second argument (negative set)"; value = negative; } ]; @@ -456,7 +532,7 @@ If a directory does not recursively contain any file, it is omitted from the sto let # "fileset" would be a better name, but that would clash with the argument name, # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.trace: argument" fileset; + actualFileset = _coerce "lib.fileset.trace: Argument" fileset; in seq (_printFileset actualFileset) @@ -503,7 +579,7 @@ If a directory does not recursively contain any file, it is omitted from the sto let # "fileset" would be a better name, but that would clash with the argument name, # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.traceVal: argument" fileset; + actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset; in seq (_printFileset actualFileset) diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index b919a5de3eef4..717253f45715b 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -7,7 +7,6 @@ let isString pathExists readDir - seq split trace typeOf @@ -17,7 +16,6 @@ let attrNames attrValues mapAttrs - setAttrByPath zipAttrsWith ; @@ -28,7 +26,6 @@ let inherit (lib.lists) all commonPrefix - drop elemAt filter findFirst @@ -170,7 +167,12 @@ rec { else value else if ! isPath value then - if isStringLike value then + if value ? _isLibCleanSourceWith then + throw '' + ${context} is a `lib.sources`-based value, but it should be a file set or a path instead. + To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. + Note that this only works for sources created from paths.'' + else if isStringLike value then throw '' ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead. Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' @@ -179,7 +181,7 @@ rec { ${context} is of type ${typeOf value}, but it should be a file set or a path instead.'' else if ! pathExists value then throw '' - ${context} (${toString value}) does not exist.'' + ${context} (${toString value}) is a path that does not exist.'' else _singleton value; @@ -208,9 +210,9 @@ rec { if firstWithBase != null && differentIndex != null then throw '' ${functionContext}: Filesystem roots are not the same: - ${(head list).context}: root "${toString firstBaseRoot}" - ${(elemAt list differentIndex).context}: root "${toString (elemAt filesets differentIndex)._internalBaseRoot}" - Different roots are not supported.'' + ${(head list).context}: Filesystem root is "${toString firstBaseRoot}" + ${(elemAt list differentIndex).context}: Filesystem root is "${toString (elemAt filesets differentIndex)._internalBaseRoot}" + Different filesystem roots are not supported.'' else filesets; @@ -473,6 +475,59 @@ rec { else nonEmpty; + # Turn a builtins.filterSource-based source filter on a root path into a file set + # containing only files included by the filter. + # The filter is lazily called as necessary to determine whether paths are included + # Type: Path -> (String -> String -> Bool) -> fileset + _fromSourceFilter = root: sourceFilter: + let + # During the recursion we need to track both: + # - The path value such that we can safely call `readDir` on it + # - The path string value such that we can correctly call the `filter` with it + # + # While we could just recurse with the path value, + # this would then require converting it to a path string for every path, + # which is a fairly expensive operation + + # Create a file set from a directory entry + fromDirEntry = path: pathString: type: + # The filter needs to run on the path as a string + if ! sourceFilter pathString type then + null + else if type == "directory" then + fromDir path pathString + else + type; + + # Create a file set from a directory + fromDir = path: pathString: + mapAttrs + # This looks a bit funny, but we need both the path-based and the path string-based values + (name: fromDirEntry (path + "/${name}") (pathString + "/${name}")) + # We need to readDir on the path value, because reading on a path string + # would be unspecified if there are multiple filesystem roots + (readDir path); + + rootPathType = pathType root; + + # We need to convert the path to a string to imitate what builtins.path calls the filter function with. + # We don't want to rely on `toString` for this though because it's not very well defined, see ../path/README.md + # So instead we use `lib.path.splitRoot` to safely deconstruct the path into its filesystem root and subpath + # We don't need the filesystem root though, builtins.path doesn't expose that in any way to the filter. + # So we only need the components, which we then turn into a string as one would expect. + rootString = "/" + concatStringsSep "/" (components (splitRoot root).subpath); + in + if rootPathType == "directory" then + # We imitate builtins.path not calling the filter on the root path + _create root (fromDir root rootString) + else + # Direct files are always included by builtins.path without calling the filter + # But we need to lift up the base path to its parent to satisfy the base path invariant + _create (dirOf root) + { + ${baseNameOf root} = rootPathType; + }; + # Transforms the filesetTree of a file set to a shorter base path, e.g. # _shortenTreeBase [ "foo" ] (_create /foo/bar null) # => { bar = null; } diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 2df0727bde38d..796a03b52f0e4 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash # shellcheck disable=SC2016 +# shellcheck disable=SC2317 +# shellcheck disable=SC2192 # Tests lib.fileset # Run: @@ -224,6 +226,43 @@ withFileMonitor() { fi } + +# Create the tree structure declared in the tree variable, usage: +# +# tree=( +# [a/b] = # Declare that file a/b should exist +# [c/a] = # Declare that file c/a should exist +# [c/d/]= # Declare that directory c/d/ should exist +# ) +# createTree +declare -A tree +createTree() { + # Track which paths need to be created + local -a dirsToCreate=() + local -a filesToCreate=() + for p in "${!tree[@]}"; do + # If keys end with a `/` we treat them as directories, otherwise files + if [[ "$p" =~ /$ ]]; then + dirsToCreate+=("$p") + else + filesToCreate+=("$p") + fi + done + + # Create all the necessary paths. + # This is done with only a fixed number of processes, + # in order to not be too slow + # Though this does mean we're a bit limited with how many files can be created + if (( ${#dirsToCreate[@]} != 0 )); then + mkdir -p "${dirsToCreate[@]}" + fi + if (( ${#filesToCreate[@]} != 0 )); then + readarray -d '' -t parentsToCreate < <(dirname -z "${filesToCreate[@]}") + mkdir -p "${parentsToCreate[@]}" + touch "${filesToCreate[@]}" + fi +} + # Check whether a file set includes/excludes declared paths as expected, usage: # # tree=( @@ -232,34 +271,26 @@ withFileMonitor() { # [c/d/]= # Declare that directory c/d/ should exist and expect it to be excluded in the store path # ) # checkFileset './a' # Pass the fileset as the argument -declare -A tree checkFileset() { # New subshell so that we can have a separate trap handler, see `trap` below local fileset=$1 + # Create the tree + createTree + # Process the tree into separate arrays for included paths, excluded paths and excluded files. local -a included=() local -a excluded=() local -a excludedFiles=() - # Track which paths need to be created - local -a dirsToCreate=() - local -a filesToCreate=() for p in "${!tree[@]}"; do - # If keys end with a `/` we treat them as directories, otherwise files - if [[ "$p" =~ /$ ]]; then - dirsToCreate+=("$p") - isFile= - else - filesToCreate+=("$p") - isFile=1 - fi case "${tree[$p]}" in 1) included+=("$p") ;; 0) excluded+=("$p") - if [[ -n "$isFile" ]]; then + # If keys end with a `/` we treat them as directories, otherwise files + if [[ ! "$p" =~ /$ ]]; then excludedFiles+=("$p") fi ;; @@ -268,19 +299,6 @@ checkFileset() { esac done - # Create all the necessary paths. - # This is done with only a fixed number of processes, - # in order to not be too slow - # Though this does mean we're a bit limited with how many files can be created - if (( ${#dirsToCreate[@]} != 0 )); then - mkdir -p "${dirsToCreate[@]}" - fi - if (( ${#filesToCreate[@]} != 0 )); then - readarray -d '' -t parentsToCreate < <(dirname -z "${filesToCreate[@]}") - mkdir -p "${parentsToCreate[@]}" - touch "${filesToCreate[@]}" - fi - expression="toSource { root = ./.; fileset = $fileset; }" # We don't have lambda's in bash unfortunately, @@ -318,9 +336,13 @@ checkFileset() { #### Error messages ##### # Absolute paths in strings cannot be passed as `root` -expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \("/nix/store/foobar"\) is a string-like value, but it should be a path instead. +expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \(/nix/store/foobar\) is a string-like value, but it should be a path instead. \s*Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +expectFailure 'toSource { root = cleanSourceWith { src = ./.; }; fileset = ./.; }' 'lib.fileset.toSource: `root` is a `lib.sources`-based value, but it should be a path instead. +\s*To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. +\s*Note that this only works for sources created from paths.' + # Only paths are accepted as `root` expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `root` is of type int, but it should be a path instead.' @@ -328,14 +350,14 @@ expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `r mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./foo/mock-root; fileset = ./bar/mock-root; } -' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \("'"$work"'/foo/mock-root"\): -\s*`root`: root "'"$work"'/foo/mock-root" -\s*`fileset`: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' +' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \('"$work"'/foo/mock-root\): +\s*`root`: Filesystem root is "'"$work"'/foo/mock-root" +\s*`fileset`: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' rm -rf -- * # `root` needs to exist -expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a path that does not exist.' # `root` needs to be a file touch a @@ -365,9 +387,12 @@ rm -rf -- * expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a file set or a path instead.' expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a file set or a path instead. \s*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +expectFailure 'toSource { root = ./.; fileset = cleanSourceWith { src = ./.; }; }' 'lib.fileset.toSource: `fileset` is a `lib.sources`-based value, but it should be a file set or a path instead. +\s*To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. +\s*Note that this only works for sources created from paths.' # Path coercion errors for non-existent paths -expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) is a path that does not exist.' # File sets cannot be evaluated directly expectFailure 'union ./. ./.' 'lib.fileset: Directly evaluating a file set is not supported. @@ -490,26 +515,26 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = union ./foo/mock-root ./bar/mock-root; } ' 'lib.fileset.union: Filesystem roots are not the same: -\s*first argument: root "'"$work"'/foo/mock-root" -\s*second argument: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' +\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" +\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = unions [ ./foo/mock-root ./bar/mock-root ]; } ' 'lib.fileset.unions: Filesystem roots are not the same: -\s*element 0: root "'"$work"'/foo/mock-root" -\s*element 1: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' +\s*Element 0: Filesystem root is "'"$work"'/foo/mock-root" +\s*Element 1: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' rm -rf -- * # Coercion errors show the correct context -expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: first argument \('"$work"'/a\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.union: second argument \('"$work"'/b\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: element 0 \('"$work"'/a\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: element 1 \('"$work"'/b\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: First argument \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.union: Second argument \('"$work"'/b\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: Element 0 \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: Element 1 \('"$work"'/b\) is a path that does not exist.' # unions needs a list -expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Expected argument to be a list, but got a null.' +expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Argument is of type null, but it should be a list instead.' # The tree of later arguments should not be evaluated if a former argument already includes all files tree=() @@ -603,14 +628,14 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = intersection ./foo/mock-root ./bar/mock-root; } ' 'lib.fileset.intersection: Filesystem roots are not the same: -\s*first argument: root "'"$work"'/foo/mock-root" -\s*second argument: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' +\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" +\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' rm -rf -- * # Coercion errors show the correct context -expectFailure 'toSource { root = ./.; fileset = intersection ./a ./.; }' 'lib.fileset.intersection: first argument \('"$work"'/a\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = intersection ./. ./b; }' 'lib.fileset.intersection: second argument \('"$work"'/b\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = intersection ./a ./.; }' 'lib.fileset.intersection: First argument \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = intersection ./. ./b; }' 'lib.fileset.intersection: Second argument \('"$work"'/b\) is a path that does not exist.' # The tree of later arguments should not be evaluated if a former argument already excludes all files tree=( @@ -995,6 +1020,217 @@ touch 0 "${filesToCreate[@]}" expectTrace 'unions (mapAttrsToList (n: _: ./. + "/${n}") (removeAttrs (builtins.readDir ./.) [ "0" ]))' "$expectedTrace" rm -rf -- * +## lib.fileset.fromSource + +# Check error messages +expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' + +expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead. +\s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' + +expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' + +# fromSource on a path works and is the same as coercing that path +mkdir a +touch a/b c +expectEqual 'trace (fromSource ./.) null' 'trace ./. null' +rm -rf -- * + +# Check that converting to a file set doesn't read the included files +mkdir a +touch a/b +run() { + expectEqual "trace (fromSource (lib.cleanSourceWith { src = ./a; })) null" "builtins.trace \"$work/a (all files in directory)\" null" + rm a/b +} +withFileMonitor run a/b +rm -rf -- * + +# Check that converting to a file set doesn't read entries for directories that are filtered out +mkdir -p a/b +touch a/b/c +run() { + expectEqual "trace (fromSource (lib.cleanSourceWith { + src = ./a; + filter = pathString: type: false; + })) null" "builtins.trace \"(empty)\" null" + rm a/b/c + rmdir a/b +} +withFileMonitor run a/b +rm -rf -- * + +# The filter is not needed on empty directories +expectEqual 'trace (fromSource (lib.cleanSourceWith { + src = ./.; + filter = abort "filter should not be needed"; +})) null' 'trace _emptyWithoutBase null' + +# Single files also work +touch a b +expectEqual 'trace (fromSource (cleanSourceWith { src = ./a; })) null' 'trace ./a null' +rm -rf -- * + +# For a tree assigning each subpath true/false, +# check whether a source filter with those results includes the same files +# as a file set created using fromSource. Usage: +# +# tree=( +# [a]=1 # ./a is a file and the filter should return true for it +# [b/]=0 # ./b is a directory and the filter should return false for it +# ) +# checkSource +checkSource() { + createTree + + # Serialise the tree as JSON (there's only minimal savings with jq, + # and we don't need to handle escapes) + { + echo "{" + first=1 + for p in "${!tree[@]}"; do + if [[ -z "$first" ]]; then + echo "," + else + first= + fi + echo "\"$p\":" + case "${tree[$p]}" in + 1) + echo "true" + ;; + 0) + echo "false" + ;; + *) + die "Unsupported tree value: ${tree[$p]}" + esac + done + echo "}" + } > "$tmp/tree.json" + + # An expression to create a source value with a filter matching the tree + sourceExpr=' + let + tree = importJSON '"$tmp"'/tree.json; + in + cleanSourceWith { + src = ./.; + filter = + pathString: type: + let + stripped = removePrefix (toString ./. + "/") pathString; + key = stripped + optionalString (type == "directory") "/"; + in + tree.${key} or + (throw "tree key ${key} missing"); + } + ' + + filesetExpr=' + toSource { + root = ./.; + fileset = fromSource ('"$sourceExpr"'); + } + ' + + # Turn both into store paths + sourceStorePath=$(expectStorePath "$sourceExpr") + filesetStorePath=$(expectStorePath "$filesetExpr") + + # Loop through each path in the tree + while IFS= read -r -d $'\0' subpath; do + if [[ ! -e "$sourceStorePath"/"$subpath" ]]; then + # If it's not in the source store path, it's also not in the file set store path + if [[ -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr doesn't contain $subpath, but the corresponding store path $filesetStorePath created via fromSource does contain $subpath" + fi + elif [[ -z "$(find "$sourceStorePath"/"$subpath" -type f)" ]]; then + # If it's an empty directory in the source store path, it shouldn't be in the file set store path + if [[ -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr contains the path $subpath without any files, but the corresponding store path $filesetStorePath created via fromSource didn't omit it" + fi + else + # If it's non-empty directory or a file, it should be in the file set store path + if [[ ! -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr contains the non-empty path $subpath, but the corresponding store path $filesetStorePath created via fromSource doesn't include it" + fi + fi + done < <(find . -mindepth 1 -print0) + + rm -rf -- * +} + +# Check whether the filter is evaluated correctly +tree=( + [a]= + [b/]= + [b/c]= + [b/d]= + [e/]= + [e/e/]= +) +# We fill out the above tree values with all possible combinations of 0 and 1 +# Then check whether a filter based on those return values gets turned into the corresponding file set +for i in $(seq 0 $((2 ** ${#tree[@]} - 1 ))); do + for p in "${!tree[@]}"; do + tree[$p]=$(( i % 2 )) + (( i /= 2 )) || true + done + checkSource +done + +# The filter is called with the same arguments in the same order +mkdir a e +touch a/b a/c d e +expectEqual ' + trace (fromSource (cleanSourceWith { + src = ./.; + filter = pathString: type: builtins.trace "${pathString} ${toString type}" true; + })) null +' ' + builtins.seq (cleanSourceWith { + src = ./.; + filter = pathString: type: builtins.trace "${pathString} ${toString type}" true; + }).outPath + builtins.trace "'"$work"' (all files in directory)" + null +' +rm -rf -- * + +# Test that if a directory is not included, the filter isn't called on its contents +mkdir a b +touch a/c b/d +expectEqual 'trace (fromSource (cleanSourceWith { + src = ./.; + filter = pathString: type: + if pathString == toString ./a then + false + else if pathString == toString ./b then + true + else if pathString == toString ./b/d then + true + else + abort "This filter should not be called with path ${pathString}"; +})) null' 'trace (_create ./. { b = "directory"; }) null' +rm -rf -- * + +# The filter is called lazily: +# If a later say intersection removes a part of the tree, the filter won't run on it +mkdir a d +touch a/{b,c} d/e +expectEqual 'trace (intersection ./a (fromSource (lib.cleanSourceWith { + src = ./.; + filter = pathString: type: + if pathString == toString ./a || pathString == toString ./a/b then + true + else if pathString == toString ./a/c then + false + else + abort "filter should not be called on ${pathString}"; +}))) null' 'trace ./a/b null' +rm -rf -- * + # TODO: Once we have combinators and a property testing library, derive property tests from https://en.wikipedia.org/wiki/Algebra_of_sets echo >&2 tests ok diff --git a/lib/licenses.nix b/lib/licenses.nix index d9555ca66cb96..ad6922498ab49 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -516,17 +516,17 @@ in mkLicense lset) ({ generaluser = { fullName = "GeneralUser GS License v2.0"; - url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources + url = "https://www.schristiancollins.com/generaluser.php"; # license included in sources }; gfl = { fullName = "GUST Font License"; - url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt"; + url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt"; }; gfsl = { fullName = "GUST Font Source License"; - url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt"; + url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-SOURCE-LICENSE.txt"; }; gpl1Only = { @@ -613,7 +613,7 @@ in mkLicense lset) ({ info-zip = { spdxId = "Info-ZIP"; fullName = "Info-ZIP License"; - url = "http://www.info-zip.org/pub/infozip/license.html"; + url = "https://infozip.sourceforge.net/license.html"; }; inria-compcert = { @@ -877,6 +877,21 @@ in mkLicense lset) ({ fullName = "Non-Profit Open Software License 3.0"; }; + nvidiaCuda = { + shortName = "CUDA EULA"; + fullName = "CUDA Toolkit End User License Agreement (EULA)"; + url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement"; + free = false; + }; + + nvidiaCudaRedist = { + shortName = "CUDA EULA"; + fullName = "CUDA Toolkit End User License Agreement (EULA)"; + url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement"; + free = false; + redistributable = true; + }; + obsidian = { fullName = "Obsidian End User Agreement"; url = "https://obsidian.md/eula"; @@ -1167,7 +1182,7 @@ in mkLicense lset) ({ xfig = { fullName = "xfig"; - url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken + url = "https://mcj.sourceforge.net/authors.html#xfig"; }; zlib = { diff --git a/lib/strings.nix b/lib/strings.nix index 628669d86bbd4..695aaaacd3488 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -144,6 +144,20 @@ rec { */ concatLines = concatMapStrings (s: s + "\n"); + /* + Replicate a string n times, + and concatenate the parts into a new string. + + Type: replicate :: int -> string -> string + + Example: + replicate 3 "v" + => "vvv" + replicate 5 "hello" + => "hellohellohellohellohello" + */ + replicate = n: s: concatStrings (lib.lists.replicate n s); + /* Construct a Unix-style, colon-separated search path consisting of the given `subDir` appended to each of the given paths. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 47853f47278a3..0d30e93aafb9d 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -191,6 +191,11 @@ runTests { expected = "a\nb\nc\n"; }; + testReplicateString = { + expr = strings.replicate 5 "hello"; + expected = "hellohellohellohellohello"; + }; + testSplitStringsSimple = { expr = strings.splitString "." "a.b.c.d"; expected = [ "a" "b" "c" "d" ]; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index db93c09af0683..3c12412e7a645 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -540,6 +540,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahoneybun = { + email = "aaron@system76.com"; + github = "ahoneybun"; + githubId = 4884946; + name = "Aaron Honeycutt"; + }; ahrzb = { email = "ahrzb5@gmail.com"; github = "ahrzb"; @@ -4215,6 +4221,12 @@ githubId = 12224254; name = "Delta"; }; + delta231 = { + email = "swstkbaranwal@gmail.com"; + github = "Delta456"; + githubId = 28479139; + name = "Swastik Baranwal"; + }; deltadelta = { email = "contact@libellules.eu"; name = "Dara Ly"; @@ -5325,6 +5337,13 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + ericthemagician = { + email = "eric@ericyen.com"; + matrix = "@eric:jupiterbroadcasting.com"; + github = "EricTheMagician"; + githubId = 323436; + name = "Eric Yen"; + }; erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; @@ -7986,6 +8005,12 @@ githubId = 488556; name = "Javier Aguirre"; }; + javimerino = { + email = "merino.jav@gmail.com"; + name = "Javi Merino"; + github = "JaviMerino"; + githubId = 44926; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; @@ -12453,6 +12478,11 @@ githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -12843,13 +12873,6 @@ fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; - ninjatrappeur = { - email = "felix@alternativebit.fr"; - matrix = "@ninjatrappeur:matrix.org"; - github = "NinjaTrappeur"; - githubId = 1219785; - name = "Félix Baylac-Jacqué"; - }; nintron = { email = "nintron@sent.com"; github = "Nintron27"; @@ -12889,6 +12912,11 @@ githubId = 66913205; name = "Rick Sanchez"; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -13907,6 +13935,12 @@ githubId = 9267430; name = "Philipp Mildenberger"; }; + philiptaron = { + email = "philip.taron@gmail.com"; + github = "philiptaron"; + githubId = 43863; + name = "Philip Taron"; + }; phip1611 = { email = "phip1611@gmail.com"; github = "phip1611"; @@ -13943,6 +13977,13 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + picnoir = { + email = "felix@alternativebit.fr"; + matrix = "@picnoir:alternativebit.fr"; + github = "picnoir"; + githubId = 1219785; + name = "Félix Baylac-Jacqué"; + }; piegames = { name = "piegames"; email = "nix@piegames.de"; @@ -14611,7 +14652,7 @@ }; quantenzitrone = { email = "quantenzitrone@protonmail.com"; - github = "Quantenzitrone"; + github = "quantenzitrone"; githubId = 74491719; matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; @@ -14805,6 +14846,12 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.com"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "freeman42x"; @@ -16447,12 +16494,6 @@ githubId = 158321; name = "Stewart Mackenzie"; }; - skeidel = { - email = "svenkeidel@gmail.com"; - github = "svenkeidel"; - githubId = 266500; - name = "Sven Keidel"; - }; skykanin = { github = "skykanin"; githubId = 3789764; @@ -18833,6 +18874,12 @@ githubId = 7038383; name = "Vojta Káně"; }; + volfyd = { + email = "lb.nix@lisbethmail.com"; + github = "volfyd"; + githubId = 3578382; + name = "Leif Huhn"; + }; volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; @@ -19060,6 +19107,12 @@ fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; }]; }; + whiteley = { + email = "mattwhiteley@gmail.com"; + github = "whiteley"; + githubId = 2215; + name = "Matt Whiteley"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -19363,11 +19416,11 @@ name = "Uli Baum"; }; xfix = { - email = "konrad@borowski.pw"; + email = "kamila@borowska.pw"; matrix = "@xfix:matrix.org"; github = "xfix"; githubId = 1297598; - name = "Konrad Borowski"; + name = "Kamila Borowska"; }; xfnw = { email = "xfnw+nixos@riseup.net"; @@ -19904,6 +19957,12 @@ github = "zmitchell"; githubId = 10246891; }; + znaniye = { + email = "zn4niye@proton.me"; + github = "znaniye"; + githubId = 134703788; + name = "Samuel Silva"; + }; znewman01 = { email = "znewman01@gmail.com"; github = "znewman01"; diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 5573e5e5afc6e..2ce3ecb2ae70a 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) getEvalBuilds NoHydraSlownessWorkaround id = - hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"] + hydraJSONQuery mempty ["eval", showT id, "builds"] getEvalBuilds HydraSlownessWorkaround id = do Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] forM builds $ \buildId -> do @@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do hydraJSONQuery mempty [ "build", showT buildId ] hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) -hydraQuery responseType option query = - responseBody - <$> req - GET - (foldl' (/:) (https "hydra.nixos.org") query) - NoReqBody - responseType - (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option) +hydraQuery responseType option query = do + let customHeaderOpt = + header + "User-Agent" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes + opts = customHeaderOpt <> customTimeoutOpt <> option + url = foldl' (/:) (https "hydra.nixos.org") query + responseBody <$> req GET url NoReqBody responseType opts hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a hydraJSONQuery = hydraQuery jsonResponse diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 86fecbc3d87c9..9130941a53661 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -39,5 +39,5 @@ fi package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") -curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv echo diff --git a/nixos/doc/manual/configuration/declarative-packages.section.md b/nixos/doc/manual/configuration/declarative-packages.section.md index 02eaa56192e46..480e250da8c73 100644 --- a/nixos/doc/manual/configuration/declarative-packages.section.md +++ b/nixos/doc/manual/configuration/declarative-packages.section.md @@ -37,7 +37,7 @@ Note: the `nixos` prefix tells us that we want to get the package from the `nixos` channel and works only in CLI tools. In declarative configuration use `pkgs` prefix (variable). -To "uninstall" a package, simply remove it from +To "uninstall" a package, remove it from [](#opt-environment.systemPackages) and run `nixos-rebuild switch`. ```{=include=} sections diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 2eff15387987f..f4a566d669735 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -36,8 +36,8 @@ Here, we include two modules from the same directory, `vpn.nix` and Note that both `configuration.nix` and `kde.nix` define the option [](#opt-environment.systemPackages). When multiple modules define an option, NixOS will try to *merge* the definitions. In the case of -[](#opt-environment.systemPackages), that's easy: the lists of -packages can simply be concatenated. The value in `configuration.nix` is +[](#opt-environment.systemPackages) the lists of packages will be +concatenated. The value in `configuration.nix` is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use `mkBefore`: diff --git a/nixos/doc/manual/configuration/subversion.chapter.md b/nixos/doc/manual/configuration/subversion.chapter.md index 84f9c2703378a..ff870f5c40b97 100644 --- a/nixos/doc/manual/configuration/subversion.chapter.md +++ b/nixos/doc/manual/configuration/subversion.chapter.md @@ -2,7 +2,7 @@ [Subversion](https://subversion.apache.org/) is a centralized version-control system. It can use a [variety of -protocols](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) +protocols](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) for communication between client and server. ## Subversion inside Apache HTTP {#module-services-subversion-apache-httpd} @@ -14,7 +14,7 @@ for communication. For more information on the general setup, please refer to the [the appropriate section of the Subversion -book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). +book](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). To configure, include in `/etc/nixos/configuration.nix` code to activate Apache HTTP, setting [](#opt-services.httpd.adminAddr) diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index a80be2b523e24..9ec4a51d6e35e 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -28,7 +28,7 @@ manually (system wide), put them into your Thunar (the Xfce file manager) is automatically enabled when Xfce is enabled. To enable Thunar without enabling Xfce, use the configuration -option [](#opt-programs.thunar.enable) instead of simply adding +option [](#opt-programs.thunar.enable) instead of adding `pkgs.xfce.thunar` to [](#opt-environment.systemPackages). If you'd like to add extra plugins to Thunar, add them to diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 54002941d6349..4b8385d7e0d94 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -57,6 +57,27 @@ using: Once the connection is established, you can enter commands in the socat terminal where socat is running. +## Port forwarding to NixOS test VMs {#sec-nixos-test-port-forwarding} + +If your test has only a single VM, you may use e.g. + +```ShellSession +$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/nixos-test-driver +``` + +to port-forward a port in the VM (here `22`) to the host machine (here port `2222`). + +This naturally does not work when multiple machines are involved, +since a single port on the host cannot forward to multiple VMs. + +If the test defines multiple machines, you may opt to _temporarily_ set +`virtualisation.forwardPorts` in the test definition for debugging. + +Such port forwardings connect via the VM's virtual network interface. +Thus they cannot connect to ports that are only bound to the VM's +loopback interface (`127.0.0.1`), and the VM's NixOS firewall +must be configured to allow these connections. + ## Reuse VM state {#sec-nixos-test-reuse-vm-state} You can re-use the VM states coming from a previous run by setting the diff --git a/nixos/doc/manual/development/writing-documentation.chapter.md b/nixos/doc/manual/development/writing-documentation.chapter.md index 8cb6823d09851..3d9bd318cf339 100644 --- a/nixos/doc/manual/development/writing-documentation.chapter.md +++ b/nixos/doc/manual/development/writing-documentation.chapter.md @@ -33,13 +33,13 @@ symlink at `./result/share/doc/nixos/index.html`. ## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml} For general information on how to write in DocBook, see [DocBook 5: The -Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html). +Definitive Guide](https://tdg.docbook.org/tdg/5.1/). Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see [](#sec-emacs-docbook-xml). -[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of +[Pandoc](https://pandoc.org/) can generate DocBook XML from a multitude of formats, which makes a good starting point. Here is an example of Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML: @@ -50,7 +50,7 @@ pandoc -f markdown_github -t docbook5 docs.md -o my-section.md Pandoc can also quickly convert a single `section.xml` to HTML, which is helpful when drafting. -Sometimes writing valid DocBook is simply too difficult. In this case, +Sometimes writing valid DocBook is too difficult. In this case, submit your documentation updates in a [GitHub Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will handle the conversion to XML for you. @@ -62,9 +62,9 @@ topic from scratch. Keep the following guidelines in mind when you create and add a topic: -- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html) +- The NixOS [`book`](https://tdg.docbook.org/tdg/5.0/book.html) element is in `nixos/doc/manual/manual.xml`. It includes several - [`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in + [`parts`](https://tdg.docbook.org/tdg/5.0/book.html) which are in subdirectories. - Store the topic file in the same directory as the `part` to which it diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md index 11b49ccb1f671..12abf90b718fd 100644 --- a/nixos/doc/manual/installation/changing-config.chapter.md +++ b/nixos/doc/manual/installation/changing-config.chapter.md @@ -89,7 +89,7 @@ guest. For instance, the following will forward host port 2222 to guest port 22 (SSH): ```ShellSession -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/run-*-vm ``` allowing you to log in via SSH (assuming you have set the appropriate @@ -98,3 +98,8 @@ passwords or SSH authorized keys): ```ShellSession $ ssh -p 2222 localhost ``` + +Such port forwardings connect via the VM's virtual network interface. +Thus they cannot connect to ports that are only bound to the VM's +loopback interface (`127.0.0.1`), and the VM's NixOS firewall +must be configured to allow these connections. diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md index 4fbd6525f8c3b..c1cad99d39f34 100644 --- a/nixos/doc/manual/installation/installing-pxe.section.md +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -4,7 +4,7 @@ Advanced users may wish to install NixOS using an existing PXE or iPXE setup. These instructions assume that you have an existing PXE or iPXE -infrastructure and simply want to add the NixOS installer as another +infrastructure and want to add the NixOS installer as another option. To build the necessary files from your current version of nixpkgs, you can run: diff --git a/nixos/doc/manual/release-notes/rl-1609.section.md b/nixos/doc/manual/release-notes/rl-1609.section.md index ad3478d0ca173..0cbabf58ca039 100644 --- a/nixos/doc/manual/release-notes/rl-1609.section.md +++ b/nixos/doc/manual/release-notes/rl-1609.section.md @@ -46,7 +46,7 @@ When upgrading from a previous release, please be aware of the following incompa Other notable improvements: -- Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to simply set +- Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to set ```nix { diff --git a/nixos/doc/manual/release-notes/rl-1909.section.md b/nixos/doc/manual/release-notes/rl-1909.section.md index 22cef05d4fa75..2bd04f8dd40a3 100644 --- a/nixos/doc/manual/release-notes/rl-1909.section.md +++ b/nixos/doc/manual/release-notes/rl-1909.section.md @@ -198,7 +198,7 @@ When upgrading from a previous release, please be aware of the following incompa For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts.<name>.enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). -- The old deprecated `emacs` package sets have been dropped. What used to be called `emacsPackagesNg` is now simply called `emacsPackages`. +- The old deprecated `emacs` package sets have been dropped. What used to be called `emacsPackagesNg` is now called `emacsPackages`. - `services.xserver.desktopManager.xterm` is now disabled by default if `stateVersion` is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to have any desktopManager enabled default. diff --git a/nixos/doc/manual/release-notes/rl-2003.section.md b/nixos/doc/manual/release-notes/rl-2003.section.md index 76cee8858e80a..695f8a2c95cab 100644 --- a/nixos/doc/manual/release-notes/rl-2003.section.md +++ b/nixos/doc/manual/release-notes/rl-2003.section.md @@ -482,7 +482,7 @@ When upgrading from a previous release, please be aware of the following incompa - If you use `postgresql` on a different server, you don't need to change anything as well since this module was never designed to configure remote databases. - - If you use `postgresql` and configured your synapse initially on `19.09` or older, you simply need to enable postgresql-support explicitly: + - If you use `postgresql` and configured your synapse initially on `19.09` or older, you need to enable postgresql-support explicitly: ```nix { ... }: { diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md index 6bb75a04b3e8a..eac02a8ff445b 100644 --- a/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixos/doc/manual/release-notes/rl-2009.section.md @@ -422,7 +422,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `systemd-networkd` option `systemd.network.networks._name_.dhcpConfig` has been renamed to [systemd.network.networks._name_.dhcpV4Config](options.html#opt-systemd.network.networks._name_.dhcpV4Config) following upstream systemd's documentation change. See systemd.network 5 for details. -- In the `picom` module, several options that accepted floating point numbers encoded as strings (for example [services.picom.activeOpacity](options.html#opt-services.picom.activeOpacity)) have been changed to the (relatively) new native `float` type. To migrate your configuration simply remove the quotes around the numbers. +- In the `picom` module, several options that accepted floating point numbers encoded as strings (for example [services.picom.activeOpacity](options.html#opt-services.picom.activeOpacity)) have been changed to the (relatively) new native `float` type. To migrate your configuration remove the quotes around the numbers. - When using `buildBazelPackage` from Nixpkgs, `flat` hash mode is now used for dependencies instead of `recursive`. This is to better allow using hashed mirrors where needed. As a result, these hashes will have changed. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 37079c20967bd..1c73d0c9790d5 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -14,7 +14,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - Support for algorithms that `libxcrypt` [does not consider strong](https://github.com/besser82/libxcrypt/blob/v4.4.28/lib/hashes.conf#L41) are **deprecated** as of this release, and will be removed in NixOS 23.05. - This includes system login passwords. Given this, we **strongly encourage** all users to update their system passwords, as you will be unable to login if password hashes are not migrated by the time their support is removed. - When using `users.users.<name>.hashedPassword` to configure user passwords, run `mkpasswd`, and use the yescrypt hash that is provided as the new value. - - On the other hand, for interactively configured user passwords, simply re-set the passwords for all users with `passwd`. + - On the other hand, for interactively configured user passwords, re-set the passwords for all users with `passwd`. - This release introduces warnings for the use of deprecated hash algorithms for both methods of configuring passwords. To make sure you migrated correctly, run `nixos-rebuild switch`. - The NixOS documentation is now generated from markdown. While docbook is still part of the documentation build process, it's a big step towards the full migration. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3d27d3fef8faa..0b54b8b32a35b 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -611,7 +611,7 @@ If you are: - adding new rules with `*.rules` - running custom PulseAudio commands with `pulse.cmd` -Simply move the definitions into the drop-in. +Move the definitions into the drop-in. Note that the use of `context.exec` is not recommended and other methods of running your thing are likely a better option. diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 22bc4c31618e6..d838d33e35dc0 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -33,6 +33,8 @@ - All [ROCm](https://rocm.docs.amd.com/en/latest/) packages have been updated to 5.7.0. - [ROCm](https://rocm.docs.amd.com/en/latest/) package attribute sets are versioned: `rocmPackages` -> `rocmPackages_5`. +- `yarn-berry` has been updated to 4.0.1. This means that NodeJS versions less than `18.12` are no longer supported by it. More details at the [upstream changelog](https://github.com/yarnpkg/berry/blob/master/CHANGELOG.md). + - If the user has a custom shell enabled via `users.users.${USERNAME}.shell = ${CUSTOMSHELL}`, the assertion will require them to also set `programs.${CUSTOMSHELL}.enable = true`. This is generally safe behavior, but for anyone needing to opt out from @@ -304,7 +306,7 @@ - Emacs macport version 29 was introduced. -- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option simply did enable all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all. +- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option enabled all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all. - The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md). @@ -361,6 +363,8 @@ - The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option. +- The `prayer` package as well as `services.prayer` have been removed because it's been unmaintained for several years and the author's website has vanished. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - A new option `system.switch.enable` was added. By default, this is option is @@ -485,6 +489,8 @@ The module update takes care of the new config syntax and the data itself (user - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved for `root` and the `wheel` group. +- `virtualisation.googleComputeImage` now provides `efi` option to support UEFI booting. + - CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this: ``` @@ -511,6 +517,8 @@ The module update takes care of the new config syntax and the data itself (user - `services.bitcoind` now properly respects the `enable` option. +- The Home Assistant module now offers support for installing custom components and lovelace modules. Available at [`services.home-assistant.customComponents`](#opt-services.home-assistant.customComponents) and [`services.home-assistant.customLovelaceModules`](#opt-services.home-assistant.customLovelaceModules). + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. @@ -554,3 +562,5 @@ The module update takes care of the new config syntax and the data itself (user - `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`. + +- There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2. diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 7b600464bb415..820ccbcbf72a1 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -376,24 +376,23 @@ in rec { serviceToUnit = name: def: { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; - text = commonUnitText def + - '' - [Service] - ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: - let s = optionalString (env.${n} != null) - "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; - # systemd max line length is now 1MiB - # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af - in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} - ${if def ? reloadIfChanged && def.reloadIfChanged then '' - X-ReloadIfChanged=true - '' else if (def ? restartIfChanged && !def.restartIfChanged) then '' - X-RestartIfChanged=false - '' else ""} - ${optionalString (def ? stopIfChanged && !def.stopIfChanged) "X-StopIfChanged=false"} - ${attrsToSection def.serviceConfig} - ''; + text = commonUnitText def + '' + [Service] + '' + (let env = cfg.globalEnvironment // def.environment; + in concatMapStrings (n: + let s = optionalString (env.${n} != null) + "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; + # systemd max line length is now 1MiB + # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af + in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)) + + (if def ? reloadIfChanged && def.reloadIfChanged then '' + X-ReloadIfChanged=true + '' else if (def ? restartIfChanged && !def.restartIfChanged) then '' + X-RestartIfChanged=false + '' else "") + + optionalString (def ? stopIfChanged && !def.stopIfChanged) '' + X-StopIfChanged=false + '' + attrsToSection def.serviceConfig; }; socketToUnit = name: def: diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 529de41d892a9..f430321bb6076 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -1278,3 +1278,19 @@ class Machine: def run_callbacks(self) -> None: for callback in self.callbacks: callback() + + def switch_root(self) -> None: + """ + Transition from stage 1 to stage 2. This requires the + machine to be configured with `testing.initrdBackdoor = true` + and `boot.initrd.systemd.enable = true`. + """ + self.wait_for_unit("initrd.target") + self.execute( + "systemctl isolate --no-block initrd-switch-root.target 2>/dev/null >/dev/null", + check_return=False, + check_output=False, + ) + self.wait_for_console_text(r"systemd\[1\]:.*Switching root\.") + self.connected = False + self.connect() diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index a47d1c98ecec3..73e6d386fd1da 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -32,9 +32,6 @@ let key = "nodes.nix-pkgs"; config = optionalAttrs (!config.node.pkgsReadOnly) ( mkIf (!options.nixpkgs.pkgs.isDefined) { - # Ensure we do not use aliases. Ideally this is only set - # when the test framework is used by Nixpkgs NixOS tests. - nixpkgs.config.allowAliases = false; # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; } diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index d1dbc4e0d0598..ebd1aaea8f04a 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -16,10 +16,7 @@ with lib; }; security.sudo.keepTerminfo = mkOption { - default = config.security.sudo.package.pname != "sudo-rs"; - defaultText = literalMD '' - `true` unless using `sudo-rs` - ''; + default = true; type = types.bool; description = lib.mdDoc '' Whether to preserve the `TERMINFO` and `TERMINFO_DIRS` diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index b4251214876ef..39aac9fb821bd 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -153,7 +153,7 @@ let {file}`pam_mount.conf.xml`. Useful attributes might include `path`, `options`, `fstype`, and `server`. - See <http://pam-mount.sourceforge.net/pam_mount.conf.5.html> + See <https://pam-mount.sourceforge.net/pam_mount.conf.5.html> for more information. ''; }; diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 08141bb0e87bd..6f58e848b38ae 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -18,29 +18,16 @@ in { options = { - hardware.enableAllFirmware = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware. - ''; - }; + hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license"; - hardware.enableRedistributableFirmware = mkOption { + hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // { default = config.hardware.enableAllFirmware; defaultText = lib.literalExpression "config.hardware.enableAllFirmware"; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware with a license allowing redistribution. - ''; }; - hardware.wirelessRegulatoryDatabase = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Load the wireless regulatory database at boot. - ''; + hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // { + default = cfg.enableRedistributableFirmware || cfg.enableAllFirmware; + defaultText = literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`."; }; }; @@ -65,7 +52,6 @@ in { ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; - hardware.wirelessRegulatoryDatabase = true; }) (mkIf cfg.enableAllFirmware { assertions = [{ diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 10c37a46fdac1..e4241e9654036 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0"; - i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0"; - aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0"; - x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0"; - aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0"; + x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1"; + i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1"; + aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1"; + x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1"; + aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 85180bf2d1b4d..71737cd8ebc41 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -130,7 +130,7 @@ sub pciCheck { debug "\n"; if (defined $module) { - # See the bottom of http://pciids.sourceforge.net/pci.ids for + # See the bottom of https://pciids.sourceforge.net/pci.ids for # device classes. if (# Mass-storage controller. Definitely important. $class =~ /^0x01/ || diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixos/modules/installer/tools/nixos-option/default.nix deleted file mode 100644 index 061460f38a3b6..0000000000000 --- a/nixos/modules/installer/tools/nixos-option/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ pkgs, ... }: pkgs.nixos-option diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5b278b5e80625..18928a6bf21bb 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -86,7 +86,7 @@ in #rtkit = 45; # dynamically allocated 2021-09-03 dovecot2 = 46; dovenull2 = 47; - prayer = 49; + # prayer = 49; # dropped in 23.11 mpd = 50; clamav = 51; #fprot = 52; # unused @@ -411,7 +411,7 @@ in #rtkit = 45; # unused dovecot2 = 46; dovenull2 = 47; - prayer = 49; + # prayer = 49; # dropped in 23.11 mpd = 50; clamav = 51; #fprot = 52; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6679e5bb7c653..00da639929516 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1041,7 +1041,6 @@ ./services/networking/powerdns.nix ./services/networking/pppd.nix ./services/networking/pptpd.nix - ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix ./services/networking/quassel.nix diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index e6ac6e9957bac..a4c20560bc9b6 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -268,7 +268,7 @@ in '' mkdir -p $out if [ -d $package/share/man ]; then - find $package/share/man -type f | xargs ${pkgs.python3.pythonForBuild.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null + find $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null fi ''; in diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix index 48dc48e668f33..c41fea326149f 100644 --- a/nixos/modules/programs/npm.nix +++ b/nixos/modules/programs/npm.nix @@ -34,7 +34,7 @@ in prefix = ''${HOME}/.npm https-proxy=proxy.example.com init-license=MIT - init-author-url=http://npmjs.org + init-author-url=https://www.npmjs.com/ color=true ''; }; diff --git a/nixos/modules/programs/zsh/oh-my-zsh.md b/nixos/modules/programs/zsh/oh-my-zsh.md index 73d425244ce79..6a310006edbfc 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.md +++ b/nixos/modules/programs/zsh/oh-my-zsh.md @@ -78,7 +78,7 @@ If third-party customizations (e.g. new themes) are supposed to be added to - Completion scripts are supposed to be stored at `$out/share/zsh/site-functions`. This directory is part of the - [`fpath`](http://zsh.sourceforge.net/Doc/Release/Functions.html) + [`fpath`](https://zsh.sourceforge.io/Doc/Release/Functions.html) and the package should be compatible with pure `ZSH` setups. The module will automatically link the contents of `site-functions` to completions directory in the proper diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0fbb2351f9863..3fab863adb7f6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -111,6 +111,7 @@ in (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") + (mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead") (mkRemovedOptionModule [ "services" "dhcpd4" ] '' diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix index f75b4df1851a5..95975943ff801 100644 --- a/nixos/modules/security/google_oslogin.nix +++ b/nixos/modules/security/google_oslogin.nix @@ -42,6 +42,10 @@ in security.sudo.extraConfig = '' #includedir /run/google-sudoers.d ''; + security.sudo-rs.extraConfig = '' + #includedir /run/google-sudoers.d + ''; + systemd.tmpfiles.rules = [ "d /run/google-sudoers.d 750 root root -" "d /var/google-users.d 750 root root -" diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 709bb8b94a659..b7e1ea526535d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1531,6 +1531,10 @@ in (map (module: "mr ${module},")) concatLines ]); - }; + security.sudo.extraConfig = optionalString config.security.pam.enableSSHAgentAuth '' + # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. + Defaults env_keep+=SSH_AUTH_SOCK + ''; + }; } diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index ad78f38b08663..26f906f2a76af 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -33,7 +33,7 @@ in default = []; description = lib.mdDoc '' List of volume definitions for pam_mount. - For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>. + For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>. ''; }; @@ -78,7 +78,7 @@ in description = lib.mdDoc '' Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, and 2 additionally enables tracing in mount.crypt. The default is 0. - For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>. + For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>. ''; }; @@ -88,7 +88,7 @@ in description = lib.mdDoc '' Amount of microseconds to wait until killing remaining processes after final logout. - For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>. + For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>. ''; }; diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index de427ccb295bb..327f49c0b6378 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -35,7 +35,7 @@ in description = lib.mdDoc '' Any polkit rules to be added to config (in JavaScript ;-). See: - http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules + <https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules> ''; }; @@ -117,4 +117,3 @@ in }; } - diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index c665c15242a53..ff912dec5073f 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -6,6 +6,8 @@ let cfg = config.security.sudo; + inherit (config.security.pam) enableSSHAgentAuth; + toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; @@ -28,9 +30,18 @@ in ###### interface - options = { + options.security.sudo = { + + defaultOptions = mkOption { + type = with types; listOf str; + default = [ "SETENV" ]; + description = mdDoc '' + Options used for the default rules, granting `root` and the + `wheel` group permission to run any command as any user. + ''; + }; - security.sudo.enable = mkOption { + enable = mkOption { type = types.bool; default = true; description = @@ -40,29 +51,21 @@ in ''; }; - security.sudo.package = mkOption { - type = types.package; - default = pkgs.sudo; - defaultText = literalExpression "pkgs.sudo"; - description = lib.mdDoc '' - Which package to use for `sudo`. - ''; - }; + package = mkPackageOption pkgs "sudo" { }; - security.sudo.wheelNeedsPassword = mkOption { + wheelNeedsPassword = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - Whether users of the `wheel` group must - provide a password to run commands as super user via {command}`sudo`. - ''; + description = mdDoc '' + Whether users of the `wheel` group must + provide a password to run commands as super user via {command}`sudo`. + ''; }; - security.sudo.execWheelOnly = mkOption { + execWheelOnly = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Only allow members of the `wheel` group to execute sudo by setting the executable's permissions accordingly. This prevents users that are not members of `wheel` from @@ -70,19 +73,18 @@ in ''; }; - security.sudo.configFile = mkOption { + configFile = mkOption { type = types.lines; # Note: if syntax errors are detected in this file, the NixOS # configuration will fail to build. - description = - lib.mdDoc '' - This string contains the contents of the - {file}`sudoers` file. - ''; + description = mdDoc '' + This string contains the contents of the + {file}`sudoers` file. + ''; }; - security.sudo.extraRules = mkOption { - description = lib.mdDoc '' + extraRules = mkOption { + description = mdDoc '' Define specific rules to be in the {file}`sudoers` file. More specific rules should come after more general ones in order to yield the expected behavior. You can use mkBefore/mkAfter to ensure @@ -112,7 +114,7 @@ in options = { users = mkOption { type = with types; listOf (either str int); - description = lib.mdDoc '' + description = mdDoc '' The usernames / UIDs this rule should apply for. ''; default = []; @@ -120,7 +122,7 @@ in groups = mkOption { type = with types; listOf (either str int); - description = lib.mdDoc '' + description = mdDoc '' The groups / GIDs this rule should apply for. ''; default = []; @@ -129,7 +131,7 @@ in host = mkOption { type = types.str; default = "ALL"; - description = lib.mdDoc '' + description = mdDoc '' For what host this rule should apply. ''; }; @@ -137,7 +139,7 @@ in runAs = mkOption { type = with types; str; default = "ALL:ALL"; - description = lib.mdDoc '' + description = mdDoc '' Under which user/group the specified command is allowed to run. A user can be specified using just the username: `"foo"`. @@ -147,7 +149,7 @@ in }; commands = mkOption { - description = lib.mdDoc '' + description = mdDoc '' The commands for which the rule should apply. ''; type = with types; listOf (either str (submodule { @@ -155,7 +157,7 @@ in options = { command = mkOption { type = with types; str; - description = lib.mdDoc '' + description = mdDoc '' A command being either just a path to a binary to allow any arguments, the full command with arguments pre-set or with `""` used as the argument, not allowing arguments to the command at all. @@ -164,7 +166,7 @@ in options = mkOption { type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]); - description = lib.mdDoc '' + description = mdDoc '' Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/man/1.7.10/sudoers.man.html). ''; default = []; @@ -177,10 +179,10 @@ in }); }; - security.sudo.extraConfig = mkOption { + extraConfig = mkOption { type = types.lines; default = ""; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration text appended to {file}`sudoers`. ''; }; @@ -195,39 +197,48 @@ in message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } ]; - # We `mkOrder 600` so that the default rule shows up first, but there is - # still enough room for a user to `mkBefore` it. - security.sudo.extraRules = mkOrder 600 [ - { groups = [ "wheel" ]; - commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; - } - ]; - - security.sudo.configFile = + security.sudo.extraRules = + let + defaultRule = { users ? [], groups ? [], opts ? [] }: [ { + inherit users groups; + commands = [ { + command = "ALL"; + options = opts ++ cfg.defaultOptions; + } ]; + } ]; + in mkMerge [ + # This is ordered before users' `mkBefore` rules, + # so as not to introduce unexpected changes. + (mkOrder 400 (defaultRule { users = [ "root" ]; })) + + # This is ordered to show before (most) other rules, but + # late-enough for a user to `mkBefore` it. + (mkOrder 600 (defaultRule { + groups = [ "wheel" ]; + opts = (optional (!cfg.wheelNeedsPassword) "NOPASSWD"); + })) + ]; + + security.sudo.configFile = concatStringsSep "\n" (filter (s: s != "") [ '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ # or ‘security.sudo.extraRules’ instead. - - # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. - Defaults env_keep+=SSH_AUTH_SOCK - - # "root" is allowed to do anything. - root ALL=(ALL:ALL) SETENV: ALL - - # extraRules - ${concatStringsSep "\n" ( - lists.flatten ( - map ( - rule: optionals (length rule.commands != 0) [ - (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) - (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) - ] - ) cfg.extraRules - ) - )} - + '' + (pipe cfg.extraRules [ + (filter (rule: length rule.commands != 0)) + (map (rule: [ + (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) + (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) + ])) + flatten + (concatStringsSep "\n") + ]) + "\n" + (optionalString (cfg.extraConfig != "") '' + # extraConfig ${cfg.extraConfig} - ''; + '') + ]); security.wrappers = let owner = "root"; diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index 105e99cb2f5ed..b51f2a78c9832 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -225,7 +225,7 @@ in { description = "JACK Audio system service user"; isSystemUser = true; }; - # http://jackaudio.org/faq/linux_rt_config.html + # https://jackaudio.org/faq/linux_rt_config.html security.pam.loginLimits = [ { domain = "@jackaudio"; type = "-"; item = "rtprio"; value = "99"; } { domain = "@jackaudio"; type = "-"; item = "memlock"; value = "unlimited"; } diff --git a/nixos/modules/services/audio/wyoming/faster-whisper.nix b/nixos/modules/services/audio/wyoming/faster-whisper.nix index f156e8314a95f..2d56acdc1b4cd 100644 --- a/nixos/modules/services/audio/wyoming/faster-whisper.nix +++ b/nixos/modules/services/audio/wyoming/faster-whisper.nix @@ -146,6 +146,8 @@ in CapabilityBoundingSet = ""; DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [ # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf + # CUDA not working? Check DeviceAllow and PrivateDevices first! + "/dev/nvidia0" "/dev/nvidia1" "/dev/nvidia2" "/dev/nvidia3" @@ -160,7 +162,6 @@ in DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; - PrivateDevices = true; PrivateUsers = true; ProtectHome = true; ProtectHostname = true; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 49a55d0560140..87595f39796d9 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -133,13 +133,15 @@ in }; timerConfig = mkOption { - type = types.attrsOf unitOption; + type = types.nullOr (types.attrsOf unitOption); default = { OnCalendar = "daily"; Persistent = true; }; description = lib.mdDoc '' - When to run the backup. See {manpage}`systemd.timer(5)` for details. + When to run the backup. See {manpage}`systemd.timer(5)` for + details. If null no timer is created and the backup will only + run when explicitly started. ''; example = { OnCalendar = "00:05"; @@ -345,7 +347,7 @@ in } // optionalAttrs (backup.environmentFile != null) { EnvironmentFile = backup.environmentFile; }; - } // optionalAttrs (backup.initialize || backup.dynamicFilesFrom != null || backup.backupPrepareCommand != null) { + } // optionalAttrs (backup.initialize || doBackup || backup.backupPrepareCommand != null) { preStart = '' ${optionalString (backup.backupPrepareCommand != null) '' ${pkgs.writeScript "backupPrepareCommand" backup.backupPrepareCommand} @@ -360,12 +362,12 @@ in ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile} ''} ''; - } // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) { + } // optionalAttrs (doBackup || backup.backupCleanupCommand != null) { postStop = '' ${optionalString (backup.backupCleanupCommand != null) '' ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand} ''} - ${optionalString (backup.dynamicFilesFrom != null) '' + ${optionalString doBackup '' rm ${filesFromTmpFile} ''} ''; @@ -378,7 +380,7 @@ in wantedBy = [ "timers.target" ]; timerConfig = backup.timerConfig; }) - config.services.restic.backups; + (filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups); # generate wrapper scripts, as described in the createWrapper option environment.systemPackages = lib.mapAttrsToList (name: backup: let diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index 51475171bf3f9..ff16795c82084 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -54,7 +54,7 @@ in only the hosts listed in {var}`dataDir`/remote_hosts.cfg will be allowed to connect. - See also: <http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access> + See also: <https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access> ''; }; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 344c43a429b32..1cbe7b893f83a 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,7 +6,7 @@ let cfg = config.services.slurm; opt = options.services.slurm; - # configuration file can be generated by http://slurm.schedmd.com/configurator.html + # configuration file can be generated by https://slurm.schedmd.com/configurator.html defaultUser = "slurm"; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 0a81a8dceeeed..bfecfbb3664fb 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -79,7 +79,7 @@ in { ''; }; - # couchdb options: http://docs.couchdb.org/en/latest/config/index.html + # couchdb options: https://docs.couchdb.org/en/latest/config/index.html databaseDir = mkOption { type = types.path; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 26ed46f0e60c0..3927c81d953dd 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -17,7 +17,7 @@ # There are at least two ways to run firebird. superserver has been chosen # however there are no strong reasons to prefer this or the other one AFAIK # Eg superserver is said to be most efficiently using resources according to -# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html +# https://www.firebirdsql.org/manual/qsg25-classic-or-super.html with lib; diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 12c8253ab49cb..a0933a5ffc45d 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -66,7 +66,7 @@ in { pgmanage requires at least one PostgreSQL server be defined. Detailed information about PostgreSQL connection strings is available at: - <http://www.postgresql.org/docs/current/static/libpq-connect.html> + <https://www.postgresql.org/docs/current/libpq-connect.html> Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index e4b679a3eee00..d65d9616e2f2d 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -5,7 +5,7 @@ *Source:* {file}`modules/services/databases/postgresql.nix` -*Upstream documentation:* <http://www.postgresql.org/docs/> +*Upstream documentation:* <https://www.postgresql.org/docs/> <!-- FIXME: more stuff, like maintainer? --> diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 21e6a60e32a35..af4db5c9611f6 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -588,7 +588,7 @@ in else "simple"; # Shut down Postgres using SIGINT ("Fast Shutdown mode"). See - # http://www.postgresql.org/docs/current/static/server-shutdown.html + # https://www.postgresql.org/docs/current/server-shutdown.html KillSignal = "SIGINT"; KillMode = "mixed"; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 86b295dadf494..315a0282cd736 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -63,7 +63,7 @@ in { vmOverCommit = mkEnableOption (lib.mdDoc '' setting of vm.overcommit_memory to 1 - (Suggested for Background Saving: http://redis.io/topics/faq) + (Suggested for Background Saving: <https://redis.io/docs/get-started/faq/>) ''); servers = mkOption { diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 10a2f1f9eca0d..d0320c1e6307a 100644 --- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -51,7 +51,7 @@ with lib; }) (mkIf (!config.services.gnome.at-spi2-core.enable) { - environment.variables = { + environment.sessionVariables = { NO_AT_BRIDGE = "1"; GTK_A11Y = "none"; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 24987374ab0d6..08ca7a0d247d0 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -279,7 +279,7 @@ in default = true; type = types.bool; description = lib.mdDoc '' - Whether to assign [predictable names to network interfaces](http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames). + Whether to assign [predictable names to network interfaces](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/). If enabled, interfaces are assigned names that contain topology information (e.g. `wlp3s0`) and thus should be stable diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 789b06af19b1c..54fd3e17292f6 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -16,7 +16,8 @@ let cp ${format.generate "configuration.yaml" filteredConfig} $out sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out ''; - lovelaceConfig = cfg.lovelaceConfig or {}; + lovelaceConfig = if (cfg.lovelaceConfig == null) then {} + else (lib.recursiveUpdate customLovelaceModulesResources cfg.lovelaceConfig); lovelaceConfigFile = format.generate "ui-lovelace.yaml" lovelaceConfig; # Components advertised by the home-assistant package @@ -62,8 +63,24 @@ let # Respect overrides that already exist in the passed package and # concat it with values passed via the module. extraComponents = oldArgs.extraComponents or [] ++ extraComponents; - extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps); + extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) + ++ (cfg.extraPackages ps) + ++ (lib.concatMap (component: component.propagatedBuildInputs or []) cfg.customComponents); })); + + # Create a directory that holds all lovelace modules + customLovelaceModulesDir = pkgs.buildEnv { + name = "home-assistant-custom-lovelace-modules"; + paths = cfg.customLovelaceModules; + }; + + # Create parts of the lovelace config that reference lovelave modules as resources + customLovelaceModulesResources = { + lovelace.resources = map (card: { + url = "/local/nixos-lovelace-modules/${card.entrypoint or card.pname}.js?${card.version}"; + type = "module"; + }) cfg.customLovelaceModules; + }; in { imports = [ # Migrations in NixOS 22.05 @@ -137,6 +154,41 @@ in { ''; }; + customComponents = mkOption { + type = types.listOf types.package; + default = []; + example = literalExpression '' + with pkgs.home-assistant-custom-components; [ + prometheus-sensor + ]; + ''; + description = lib.mdDoc '' + List of custom component packages to install. + + Available components can be found below `pkgs.home-assistant-custom-components`. + ''; + }; + + customLovelaceModules = mkOption { + type = types.listOf types.package; + default = []; + example = literalExpression '' + with pkgs.home-assistant-custom-lovelace-modules; [ + mini-graph-card + mini-media-player + ]; + ''; + description = lib.mdDoc '' + List of custom lovelace card packages to load as lovelace resources. + + Available cards can be found below `pkgs.home-assistant-custom-lovelace-modules`. + + ::: {.note} + Automatic loading only works with lovelace in `yaml` mode. + ::: + ''; + }; + config = mkOption { type = types.nullOr (types.submodule { freeformType = format.type; @@ -408,9 +460,35 @@ in { rm -f "${cfg.configDir}/ui-lovelace.yaml" ln -s /etc/home-assistant/ui-lovelace.yaml "${cfg.configDir}/ui-lovelace.yaml" ''; + copyCustomLovelaceModules = if cfg.customLovelaceModules != [] then '' + mkdir -p "${cfg.configDir}/www" + ln -fns ${customLovelaceModulesDir} "${cfg.configDir}/www/nixos-lovelace-modules" + '' else '' + rm -f "${cfg.configDir}/www/nixos-lovelace-modules" + ''; + copyCustomComponents = '' + mkdir -p "${cfg.configDir}/custom_components" + + # remove components symlinked in from below the /nix/store + components="$(find "${cfg.configDir}/custom_components" -maxdepth 1 -type l)" + for component in "$components"; do + if [[ "$(readlink "$component")" =~ ^${escapeShellArg builtins.storeDir} ]]; then + rm "$component" + fi + done + + # recreate symlinks for desired components + declare -a components=(${escapeShellArgs cfg.customComponents}) + for component in "''${components[@]}"; do + path="$(dirname $(find "$component" -name "manifest.json"))" + ln -fns "$path" "${cfg.configDir}/custom_components/" + done + ''; in (optionalString (cfg.config != null) copyConfig) + - (optionalString (cfg.lovelaceConfig != null) copyLovelaceConfig) + (optionalString (cfg.lovelaceConfig != null) copyLovelaceConfig) + + copyCustomLovelaceModules + + copyCustomComponents ; environment.PYTHONPATH = package.pythonPath; serviceConfig = let diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index e9e3ae1f14ce7..42d52a61639e2 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -123,7 +123,7 @@ in example = '' if [type] == "syslog" { # Keep only relevant systemd fields - # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html + # https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html prune { whitelist_names => [ "type", "@timestamp", "@version", diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 632b7caaac403..335b1b684b1a1 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -186,7 +186,7 @@ let defaultFirewallRules = { # udp 1900 port needs to be opened for SSDP (not configurable within # mediatomb/gerbera) cf. - # http://docs.gerbera.io/en/latest/run.html?highlight=udp%20port#network-setup + # https://docs.gerbera.io/en/latest/run.html?highlight=udp%20port#network-setup allowedUDPPorts = [ 1900 cfg.port ]; allowedTCPPorts = [ cfg.port ]; }; diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index bee9716629722..f2b09f4bc4b61 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -25,7 +25,7 @@ let || head srvMatch == srv # Include sections for the service being configured then v # Enable Web links and integrations between services. - else if tail srvMatch == [ null ] && elem (head srvMatch) cfg.services + else if tail srvMatch == [ null ] && cfg.${head srvMatch}.enable then { inherit (v) origin; # mansrht crashes without it @@ -38,9 +38,9 @@ let # for services needing access to them. "builds.sr.ht::worker".buildlogs = "/var/log/sourcehut/buildsrht-worker"; "git.sr.ht".post-update-script = "/usr/bin/gitsrht-update-hook"; - "git.sr.ht".repos = "/var/lib/sourcehut/gitsrht/repos"; + "git.sr.ht".repos = cfg.settings."git.sr.ht".repos; "hg.sr.ht".changegroup-script = "/usr/bin/hgsrht-hook-changegroup"; - "hg.sr.ht".repos = "/var/lib/sourcehut/hgsrht/repos"; + "hg.sr.ht".repos = cfg.settings."hg.sr.ht".repos; # Making this a per service option despite being in a global section, # so that it uses the redis-server used by the service. "sr.ht".redis-host = cfg.${srv}.redis.host; @@ -77,6 +77,14 @@ let type = types.path; apply = s: "<" + toString s; }; + api-origin = mkOption { + description = lib.mdDoc "Origin URL for the API"; + type = types.str; + default = "http://${cfg.listenAddress}:${toString (cfg.${srv}.port + 100)}"; + defaultText = lib.literalMD '' + `"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.${srv}.port)` + 100)}"` + ''; + }; }; # Specialized python containing all the modules @@ -112,15 +120,6 @@ in and account management services ''); - services = mkOption { - type = with types; listOf (enum - [ "builds" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]); - defaultText = "locally enabled services"; - description = lib.mdDoc '' - Services that may be displayed as links in the title bar of the Web interface. - ''; - }; - listenAddress = mkOption { type = types.str; default = "localhost"; @@ -400,8 +399,8 @@ in This setting is propagated to newer and existing repositories. ''; type = types.str; - default = "${cfg.python}/bin/hgsrht-hook-changegroup"; - defaultText = "\${cfg.python}/bin/hgsrht-hook-changegroup"; + default = "${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup"; + defaultText = "\${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup"; }; repos = mkOption { description = lib.mdDoc '' @@ -501,12 +500,6 @@ in options."meta.sr.ht" = removeAttrs (commonServiceSettings "meta") ["oauth-client-id" "oauth-client-secret"] // { - api-origin = mkOption { - description = lib.mdDoc "Origin URL for API, 100 more than web."; - type = types.str; - default = "http://${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; - defaultText = lib.literalMD ''`"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.meta.port)` + 100)}"`''; - }; webhooks = mkOption { description = lib.mdDoc "The Redis connection used for the webhooks worker."; type = types.str; @@ -784,6 +777,7 @@ in extraConfig = '' PermitUserEnvironment SRHT_* ''; + startWhenNeeded = false; }; environment.etc."ssh/sourcehut/config.ini".source = settingsFormat.generate "sourcehut-dispatch-config.ini" @@ -792,15 +786,28 @@ in environment.etc."ssh/sourcehut/subdir/srht-dispatch" = { # sshd_config(5): The program must be owned by root, not writable by group or others mode = "0755"; - source = pkgs.writeShellScript "srht-dispatch" '' + source = pkgs.writeShellScript "srht-dispatch-wrapper" '' set -e + set -x cd /etc/ssh/sourcehut/subdir - ${cfg.python}/bin/gitsrht-dispatch "$@" + ${pkgs.sourcehut.gitsrht}/bin/gitsrht-dispatch "$@" ''; }; + systemd.tmpfiles.settings."10-sourcehut-gitsrht" = mkIf cfg.git.enable ( + builtins.listToAttrs (map (name: { + name = "/var/log/sourcehut/gitsrht-${name}"; + value.f = { + inherit (cfg.git) user group; + mode = "0644"; + }; + }) [ "keys" "shell" "update-hook" ]) + ); systemd.services.sshd = { - #path = optional cfg.git.enable [ cfg.git.package ]; + preStart = mkIf cfg.hg.enable '' + chown ${cfg.hg.user}:${cfg.hg.group} /var/log/sourcehut/hgsrht-keys + ''; serviceConfig = { + LogsDirectory = "sourcehut"; BindReadOnlyPaths = # Note that those /usr/bin/* paths are hardcoded in multiple places in *.sr.ht, # for instance to get the user from the [git.sr.ht::dispatch] settings. @@ -813,7 +820,6 @@ in "${pkgs.writeShellScript "buildsrht-keys-wrapper" '' set -e cd /run/sourcehut/buildsrht/subdir - set -x exec -a "$0" ${pkgs.sourcehut.buildsrht}/bin/buildsrht-keys "$@" ''}:/usr/bin/buildsrht-keys" "${pkgs.sourcehut.buildsrht}/bin/master-shell:/usr/bin/master-shell" @@ -825,31 +831,26 @@ in "${pkgs.writeShellScript "gitsrht-keys-wrapper" '' set -e cd /run/sourcehut/gitsrht/subdir - set -x exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-keys "$@" ''}:/usr/bin/gitsrht-keys" "${pkgs.writeShellScript "gitsrht-shell-wrapper" '' set -e cd /run/sourcehut/gitsrht/subdir - set -x + export PATH="${cfg.git.package}/bin:$PATH" + export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-shell "$@" ''}:/usr/bin/gitsrht-shell" "${pkgs.writeShellScript "gitsrht-update-hook" '' set -e - test -e "''${PWD%/*}"/config.ini || - # Git hooks are run relative to their repository's directory, - # but gitsrht-update-hook looks up ../config.ini - ln -s /run/sourcehut/gitsrht/config.ini "''${PWD%/*}"/config.ini + export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini # hooks/post-update calls /usr/bin/gitsrht-update-hook as hooks/stage-3 # but this wrapper being a bash script, it overrides $0 with /usr/bin/gitsrht-update-hook # hence this hack to put hooks/stage-3 back into gitsrht-update-hook's $0 if test "''${STAGE3:+set}" then - set -x exec -a hooks/stage-3 ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@" else export STAGE3=set - set -x exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@" fi ''}:/usr/bin/gitsrht-update-hook" @@ -860,13 +861,11 @@ in "${pkgs.writeShellScript "hgsrht-keys-wrapper" '' set -e cd /run/sourcehut/hgsrht/subdir - set -x exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-keys "$@" ''}:/usr/bin/hgsrht-keys" "${pkgs.writeShellScript "hgsrht-shell-wrapper" '' set -e cd /run/sourcehut/hgsrht/subdir - set -x exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-shell "$@" ''}:/usr/bin/hgsrht-shell" # Mercurial's changegroup hooks are run relative to their repository's directory, @@ -875,8 +874,7 @@ in set -e test -e "''$PWD"/config.ini || ln -s /run/sourcehut/hgsrht/config.ini "''$PWD"/config.ini - set -x - exec -a "$0" ${cfg.python}/bin/hgsrht-hook-changegroup "$@" + exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup "$@" ''}:/usr/bin/hgsrht-hook-changegroup" ]; }; @@ -1066,10 +1064,11 @@ in }; }) ]; - extraServices.gitsrht-api = { - serviceConfig.Restart = "always"; - serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}"; + extraServices.gitsrht-api.serviceConfig = { + Restart = "always"; + RestartSec = "5s"; + ExecStart = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}"; + BindPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/gitsrht/repos" ]; }; extraServices.gitsrht-fcgiwrap = mkIf cfg.nginx.enable { serviceConfig = { @@ -1188,7 +1187,7 @@ in extraServices.listssrht-lmtp = { wants = [ "postfix.service" ]; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; - serviceConfig.ExecStart = "${cfg.python}/bin/listssrht-lmtp"; + serviceConfig.ExecStart = "${pkgs.sourcehut.listssrht}/bin/listssrht-lmtp"; # Avoid crashing: os.chown(sock, os.getuid(), sock_gid) serviceConfig.PrivateUsers = mkForce false; }; @@ -1252,55 +1251,30 @@ in ) cfg.settings)); serviceConfig.ExecStart = "${pkgs.sourcehut.metasrht}/bin/metasrht-api -b ${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; }; - extraConfig = mkMerge [ - { - assertions = [ - { assertion = let s = cfg.settings."meta.sr.ht::billing"; in - s.enabled == "yes" -> (s.stripe-public-key != null && s.stripe-secret-key != null); - message = "If meta.sr.ht::billing is enabled, the keys must be defined."; - } - ]; - environment.systemPackages = optional cfg.meta.enable - (pkgs.writeShellScriptBin "metasrht-manageuser" '' - set -eux - if test "$(${pkgs.coreutils}/bin/id -n -u)" != '${cfg.meta.user}' - then exec sudo -u '${cfg.meta.user}' "$0" "$@" - else - # In order to load config.ini - if cd /run/sourcehut/metasrht - then exec ${cfg.python}/bin/metasrht-manageuser "$@" - else cat <<EOF - Please run: sudo systemctl start metasrht - EOF - exit 1 - fi + extraConfig = { + assertions = [ + { assertion = let s = cfg.settings."meta.sr.ht::billing"; in + s.enabled == "yes" -> (s.stripe-public-key != null && s.stripe-secret-key != null); + message = "If meta.sr.ht::billing is enabled, the keys must be defined."; + } + ]; + environment.systemPackages = optional cfg.meta.enable + (pkgs.writeShellScriptBin "metasrht-manageuser" '' + set -eux + if test "$(${pkgs.coreutils}/bin/id -n -u)" != '${cfg.meta.user}' + then exec sudo -u '${cfg.meta.user}' "$0" "$@" + else + # In order to load config.ini + if cd /run/sourcehut/metasrht + then exec ${pkgs.sourcehut.metasrht}/bin/metasrht-manageuser "$@" + else cat <<EOF + Please run: sudo systemctl start metasrht + EOF + exit 1 fi - ''); - } - (mkIf cfg.nginx.enable { - services.nginx.virtualHosts."meta.${domain}" = { - locations."/query" = { - proxyPass = cfg.settings."meta.sr.ht".api-origin; - extraConfig = '' - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain; charset=utf-8'; - add_header 'Content-Length' 0; - return 204; - } - - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; - ''; - }; - }; - }) - ]; + fi + ''); + }; }) (import ./service.nix "pages" { @@ -1356,7 +1330,7 @@ in extraServices.todosrht-lmtp = { wants = [ "postfix.service" ]; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; - serviceConfig.ExecStart = "${cfg.python}/bin/todosrht-lmtp"; + serviceConfig.ExecStart = "${pkgs.sourcehut.todosrht}/bin/todosrht-lmtp"; # Avoid crashing: os.chown(sock, os.getuid(), sock_gid) serviceConfig.PrivateUsers = mkForce false; }; @@ -1388,6 +1362,10 @@ in dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information. '') + + (mkRemovedOptionModule [ "services" "sourcehut" "services"] '' + This option was removed in favor of individual <service>.enable flags. + '') ]; meta.doc = ./default.md; diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix index aae13e0cc2c92..18c2f5effc5a5 100644 --- a/nixos/modules/services/misc/sourcehut/service.nix +++ b/nixos/modules/services/misc/sourcehut/service.nix @@ -108,7 +108,7 @@ let #SocketBindDeny = "any"; SystemCallFilter = [ "@system-service" - "~@aio" "~@keyring" "~@memlock" "~@privileged" "~@resources" "~@timer" + "~@aio" "~@keyring" "~@memlock" "~@privileged" "~@timer" "@chown" "@setuid" ]; SystemCallArchitectures = "native"; @@ -222,6 +222,23 @@ in expires 30d; ''; }; + locations."/query" = mkIf (cfg.settings.${iniKey} ? api-origin) { + proxyPass = cfg.settings.${iniKey}.api-origin; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain; charset=utf-8'; + add_header 'Content-Length' 0; + return 204; + } + + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + ''; + }; } cfg.nginx.virtualHost ]; }; @@ -236,9 +253,6 @@ in }) [srvCfg.user]; }; - services.sourcehut.services = mkDefault (filter (s: cfg.${s}.enable) - [ "builds" "dispatch" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]); - services.sourcehut.settings = mkMerge [ { "${srv}.sr.ht".origin = mkDefault "https://${srv}.${cfg.settings."sr.ht".global-domain}"; @@ -363,6 +377,20 @@ in } extraService ])) extraServices) + + # 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 + # Workaround taken from nixos/forgejo: https://github.com/NixOS/nixpkgs/pull/262741 + (lib.mkIf ( + cfg.postgresql.enable + && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" + ) { + postgresql.postStart = (lib.mkAfter '' + $PSQL -tAc 'ALTER DATABASE "${srvCfg.postgresql.database}" OWNER TO "${srvCfg.user}";' + ''); + } + ) ]; systemd.timers = mapAttrs (timerName: timer: diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index dc75fda6ed8aa..1dc19743461bb 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -108,7 +108,7 @@ in { option. A detailed description of the supported syntax can be found at-spi2-atk - http://bosun.org/configuration.html + https://bosun.org/configuration.html ''; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index e90a0e9d16db6..5e21407042b6a 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -88,7 +88,7 @@ let # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; - # http://docs.grafana.org/administration/provisioning/#datasources + # https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; @@ -140,7 +140,7 @@ let }; }; - # http://docs.grafana.org/administration/provisioning/#dashboards + # https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards grafanaTypes.dashboardConfig = types.submodule { freeformType = provisioningSettingsFormat.type; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 65c91b8f79bb6..cc3d70976204d 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -102,7 +102,7 @@ in { default = ""; description = lib.mdDoc '' Graphite webapp settings. See: - <http://graphite.readthedocs.io/en/latest/config-local-settings.html> + <https://graphite.readthedocs.io/en/latest/config-local-settings.html> ''; }; }; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 90a51181ac30b..5ed7cac48ae71 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -4,7 +4,7 @@ # TODO: LWP/Pg perl libs aren't recognized # TODO: support fastcgi -# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html +# https://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html # spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph # spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum @@ -147,7 +147,7 @@ in Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See <http://guide.munin-monitoring.org/en/latest/architecture/index.html>. + See <https://guide.munin-monitoring.org/en/latest/architecture/index.html>. ''; }; @@ -156,7 +156,7 @@ in type = types.lines; description = lib.mdDoc '' {file}`munin-node.conf` extra configuration. See - <http://guide.munin-monitoring.org/en/latest/reference/munin-node.conf.html> + <https://guide.munin-monitoring.org/en/latest/reference/munin-node.conf.html> ''; }; @@ -165,7 +165,7 @@ in type = types.lines; description = lib.mdDoc '' {file}`plugin-conf.d` extra plugin configuration. See - <http://guide.munin-monitoring.org/en/latest/plugin/use.html> + <https://guide.munin-monitoring.org/en/latest/plugin/use.html> ''; example = '' [fail2ban_*] @@ -273,9 +273,9 @@ in type = types.lines; description = lib.mdDoc '' {file}`munin.conf` extra global configuration. - See <http://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>. + See <https://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>. Useful to setup notifications, see - <http://guide.munin-monitoring.org/en/latest/tutorial/alert.html> + <https://guide.munin-monitoring.org/en/latest/tutorial/alert.html> ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -288,7 +288,7 @@ in description = lib.mdDoc '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See - <http://guide.munin-monitoring.org/en/latest/reference/munin.conf.html> + <https://guide.munin-monitoring.org/en/latest/reference/munin.conf.html> ''; example = literalExpression '' ''' diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 8feff22c11826..dc5fa1be29228 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -88,7 +88,7 @@ in options = { services.nagios = { - enable = mkEnableOption (lib.mdDoc ''[Nagios](http://www.nagios.org/) to monitor your system or network.''); + enable = mkEnableOption (lib.mdDoc ''[Nagios](https://www.nagios.org/) to monitor your system or network.''); objectDefs = mkOption { description = lib.mdDoc '' diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 3833418b5addd..de0e044453eec 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -12,6 +12,7 @@ let ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin + ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin ''; plugins = [ @@ -254,7 +255,7 @@ in { # Capabilities CapabilityBoundingSet = [ "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins - "CAP_DAC_READ_SEARCH" # is required for apps plugin + "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin "CAP_FOWNER" # is required for freeipmi plugin "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins "CAP_SYS_ADMIN" # is required for perf plugin @@ -263,6 +264,7 @@ in { "CAP_NET_RAW" # is required for fping app "CAP_SYS_CHROOT" # is required for cgroups plugin "CAP_SETUID" # is required for cgroups and cgroups-network plugins + "CAP_SYSLOG" # is required for systemd-journal plugin ]; # Sandboxing ProtectSystem = "full"; @@ -318,6 +320,14 @@ in { permissions = "u+rx,g+x,o-rwx"; }; + "systemd-journal.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; + capabilities = "cap_dac_read_search,cap_syslog+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; + "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1e654cad5dd2a..8b79ac0e0c1ea 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -19,7 +19,7 @@ let { ${pkgs.coreutils}/bin/cat << EOF From: smartd on ${host} <${nm.sender}> - To: undisclosed-recipients:; + To: ${nm.recipient} Subject: $SMARTD_SUBJECT $SMARTD_FULLMESSAGE diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 926c3c3bd5233..866661cf4e6f8 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -176,7 +176,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS DIR service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; replication = { @@ -218,7 +218,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS DIR replication plugin. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; @@ -319,7 +319,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS MRC service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; replication = { @@ -361,7 +361,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS MRC replication plugin. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; @@ -438,7 +438,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS OSD service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 5a1d03f072117..279927781edc4 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -139,7 +139,7 @@ in path. See - <http://www.asterisk.org/community/documentation> + <https://www.asterisk.org/community/documentation/> for more examples of what is possible here. ''; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index f872daf05b8f0..808e7b66d36e2 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -239,7 +239,7 @@ in enable = mkEnableOption (lib.mdDoc "I2Pd daemon") // { description = lib.mdDoc '' Enables I2Pd as a running service upon activation. - Please read http://i2pd.readthedocs.io/en/latest/ for further + Please read <https://i2pd.readthedocs.io/en/latest/> for further configuration help. ''; }; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 036a8df635db0..2bc690cacf096 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -56,7 +56,7 @@ in The default flags prevent external hosts from using ntpd as a DDoS reflector, setting system time, and querying OS/ntpd version. As recommended in section 6.5.1.1.3, answer "No" of - http://support.ntp.org/bin/view/Support/AccessRestrictions + https://support.ntp.org/Support/AccessRestrictions ''; default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ]; }; diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index e9db7f3eab8ed..89e64d36c8a05 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -146,6 +146,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; + meta.maintainers = with lib.maintainers; [ picnoir ]; meta.doc = ./pleroma.md; } diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix deleted file mode 100644 index 197aa8a6f4480..0000000000000 --- a/nixos/modules/services/networking/prayer.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (pkgs) prayer; - - cfg = config.services.prayer; - - stateDir = "/var/lib/prayer"; - - prayerUser = "prayer"; - prayerGroup = "prayer"; - - prayerExtraCfg = pkgs.writeText "extraprayer.cf" '' - prefix = "${prayer}" - var_prefix = "${stateDir}" - prayer_user = "${prayerUser}" - prayer_group = "${prayerGroup}" - sendmail_path = "/run/wrappers/bin/sendmail" - - use_http_port ${cfg.port} - - ${cfg.extraConfig} - ''; - - prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } '' - # We have to remove the http_port 80, or it will start a server there - cat ${prayer}/etc/prayer.cf | grep -v http_port > $out - cat ${prayerExtraCfg} >> $out - ''; - -in - -{ - - ###### interface - - options = { - - services.prayer = { - - enable = mkEnableOption (lib.mdDoc "the prayer webmail http server"); - - port = mkOption { - default = 2080; - type = types.port; - description = lib.mdDoc '' - Port the prayer http server is listening to. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = "" ; - description = lib.mdDoc '' - Extra configuration. Contents will be added verbatim to the configuration file. - ''; - }; - }; - - }; - - - ###### implementation - - config = mkIf config.services.prayer.enable { - environment.systemPackages = [ prayer ]; - - users.users.${prayerUser} = - { uid = config.ids.uids.prayer; - description = "Prayer daemon user"; - home = stateDir; - }; - - users.groups.${prayerGroup} = - { gid = config.ids.gids.prayer; }; - - systemd.services.prayer = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "forking"; - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${prayerUser}:${prayerGroup} ${stateDir} - ''; - script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; - }; - }; -} diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index 5c7e7a4c22082..0f310a28d266d 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -47,7 +47,7 @@ in lib.mdDoc '' Configuration for bootstrap daemon. See <https://github.com/irungentoo/toxcore/blob/master/other/bootstrap_daemon/tox-bootstrapd.conf> - and <http://wiki.tox.im/Nodes>. + and <https://wiki.tox.chat/users/nodes>. ''; }; }; diff --git a/nixos/modules/services/networking/trust-dns.nix b/nixos/modules/services/networking/trust-dns.nix index 4196d124a2ab2..758e33f16d388 100644 --- a/nixos/modules/services/networking/trust-dns.nix +++ b/nixos/modules/services/networking/trust-dns.nix @@ -54,7 +54,7 @@ in defaultText = "pkgs.trust-dns"; description = mdDoc '' Trust-dns package to use. - Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ''; }; quiet = mkOption { @@ -135,7 +135,7 @@ in flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); flagsStr = builtins.concatStringsSep " " flags; in '' - ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} + ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr} ''; Type = "simple"; Restart = "on-failure"; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index d4099be12a278..d36be87daf60f 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -586,6 +586,7 @@ in }) all_peers; boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; + boot.kernelModules = [ "wireguard" ]; environment.systemPackages = [ pkgs.wireguard-tools ]; systemd.services = diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index b98cb5283a1a6..5efb9334ea03e 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -148,7 +148,7 @@ in type = types.bool; default = true; description = lib.mdDoc '' - Whether to enable [Micro Transport Protocol (µTP)](http://en.wikipedia.org/wiki/Micro_Transport_Protocol). + Whether to enable [Micro Transport Protocol (µTP)](https://en.wikipedia.org/wiki/Micro_Transport_Protocol). ''; }; options.watch-dir = mkOption { diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index cb438a08150f7..5c93f60cbd79e 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -32,7 +32,7 @@ let name = "mongo.conf"; executable = false; text = '' - # for documentation of all options, see http://docs.mongodb.org/manual/reference/configuration-options/ + # for documentation of all options, see https://www.mongodb.com/docs/manual/reference/configuration-options/ storage: dbPath: ${cfg.dataDir}/db @@ -63,7 +63,7 @@ let executable = false; text = '' # for documentation of all options, see: - # http://docs.mongodb.org/manual/reference/configuration-options/ + # https://www.mongodb.com/docs/manual/reference/configuration-options/ storage: dbPath: ${cfg.dataDir}/db-wt diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 5f9bbbd663744..8a8ed49115fdd 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -909,7 +909,7 @@ in { }; config = mkIf cfg.enable { - warnings = optionals (!config.security.sudo.enable) ['' + warnings = optionals (with config.security; (!sudo.enable) && (!sudo-rs.enable)) ['' The pleroma_ctl wrapper enabled by the installWrapper option relies on sudo, which appears to have been disabled through security.sudo.enable. '']; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index f80eb6b4c7f02..da1dba7d940ba 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -407,7 +407,7 @@ in type = with lib.types; nullOr (enum ["plain" "login" "cram_md5"]); default = null; description = lib.mdDoc '' - Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html + Authentication type to use, see https://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; @@ -423,7 +423,7 @@ in type = lib.types.str; default = "peer"; description = lib.mdDoc '' - How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html + How OpenSSL checks the certificate, see https://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index a25bed30e47fd..ecc7f380592ae 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -49,7 +49,7 @@ used by the imperative installer and all values are written to an additional fil to ensure that changes can be applied by changing the module's options. In case the application serves multiple domains (those are checked with -[`$_SERVER['HTTP_HOST']`](http://php.net/manual/en/reserved.variables.server.php)) +[`$_SERVER['HTTP_HOST']`](https://www.php.net/manual/en/reserved.variables.server.php)) it's needed to add them to [`services.nextcloud.config.extraTrustedDomains`](#opt-services.nextcloud.config.extraTrustedDomains). diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 592ab253f7daf..7b2e3be4295e8 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -430,7 +430,7 @@ let background processes while not running tt-rss, this method is generally viable to keep your feeds up to date. Still, there are more robust (and recommended) updating methods - available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds + available, you can read about them here: <https://tt-rss.org/wiki/UpdatingFeeds> ''; }; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 729a633a36cc2..eaa113c0d52ce 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -10,7 +10,7 @@ let # List of known lighttpd modules, ordered by how the lighttpd documentation # recommends them being imported: - # http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails + # https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails # # Some modules are always imported and should not appear in the config: # disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ]; @@ -84,8 +84,8 @@ let # server.modules += () entries in each sub-service extraConfig snippet, # read this: # - # http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails - # http://redmine.lighttpd.net/issues/2337 + # https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails + # https://redmine.lighttpd.net/issues/2337 # # Basically, lighttpd doesn't want to load (or even silently ignore) a # module for a second time, and there is no way to check if a module has diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index 2d887af87c79b..bdd6d8b62aa36 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -44,7 +44,7 @@ in { type = types.lines; description = lib.mdDoc '' Verbatim config file to use - (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + (see https://kazu-yamamoto.github.io/mighttpd2/config.html) ''; }; @@ -78,7 +78,7 @@ in { type = types.lines; description = lib.mdDoc '' Verbatim routing file to use - (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + (see https://kazu-yamamoto.github.io/mighttpd2/config.html) ''; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index f2e8585a93654..cf70dc3259456 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -955,7 +955,7 @@ in default = {}; description = lib.mdDoc '' Configure a proxy cache path entry. - See <http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path> for documentation. + See <https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path> for documentation. ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index d4b2a50cb8af9..28dd408c923c8 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -63,7 +63,7 @@ in # make available for D-BUS user services #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${e.efl}/share - # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update fi ''; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 8b5daf83de1df..12bdd9333377a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -455,7 +455,7 @@ in pkgs.glib # for gsettings program pkgs.gnome-menus pkgs.gtk3.out # for gtk-launch program - pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; in mandatoryPackages diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index eef7aa14057ea..d82d19b26cdaa 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -201,7 +201,7 @@ in onboard orca # elementary/greeter#668 sound-theme-freedesktop - xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) ++ (with pkgs.pantheon; [ # Artwork elementary-gtk-theme diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 1f08ded7c96fa..16a7ff1a4bd5e 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -96,7 +96,7 @@ let )} # Speed up application start by 50-150ms according to - # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html + # https://kdemonkey.blogspot.com/2008/04/magic-trick.html compose_cache="''${XCOMPOSECACHE:-$HOME/.compose-cache}" mkdir -p "$compose_cache" # To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory, diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index cb78f52d9b689..0861530f21e84 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -60,11 +60,11 @@ in VertRefresh 1.0 - 200.0 #To add your own modes here, use a modeline calculator, like: # cvt: - # http://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html + # https://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html # xtiming: - # http://xtiming.sourceforge.net/cgi-bin/xtiming.pl + # https://xtiming.sourceforge.net/cgi-bin/xtiming.pl # gtf: - # http://gtf.sourceforge.net/ + # https://gtf.sourceforge.net/ #This can be used to get a specific DPI, but only for the default resolution: #DisplaySize 508 317 #NOTE: the highest modes will not work without increasing the VideoRam diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix index 133e64c65cdd7..bd2bcb7bcd06c 100644 --- a/nixos/modules/services/x11/imwheel.nix +++ b/nixos/modules/services/x11/imwheel.nix @@ -37,7 +37,7 @@ in Window class translation rules. /etc/X11/imwheelrc is generated based on this config which means this config is global for all users. - See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html) + See [official man pages](https://imwheel.sourceforge.net/imwheel.1.html) for more information. ''; }; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 3df14030ab687..a8cd2e8f05fcc 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -166,7 +166,7 @@ in } ]; - warnings = lib.optional (config.boot.initrd.systemd.enable -> cfg.shell != null) '' + warnings = lib.optional (config.boot.initrd.systemd.enable && cfg.shell != null) '' Please set 'boot.initrd.systemd.users.root.shell' instead of 'boot.initrd.network.ssh.shell' ''; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 5ef3c5cd52a80..13df609071168 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -25,7 +25,7 @@ in under `/boot/extlinux.conf`. For instance, U-Boot's generic distro boot support uses this file format. - See [U-boot's documentation](http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master) + See [U-boot's documentation](https://u-boot.readthedocs.io/en/latest/develop/distro.html) for more information. ''; }; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 468f701ae5bc7..7097e1d83dca9 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -339,7 +339,7 @@ in See the [ GRUB source code - ](http://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326) + ](https://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326) for which disk modules are available. The list elements are passed directly as `argv` diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 06c329e006b84..ca560d63f3bdc 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -537,7 +537,7 @@ in description = lib.mdDoc '' Unless enabled, encryption keys can be easily recovered by an attacker with physical access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port. - More information is available at <http://en.wikipedia.org/wiki/DMA_attack>. + More information is available at <https://en.wikipedia.org/wiki/DMA_attack>. This option blacklists FireWire drivers, but doesn't remove them. You can manually load the drivers if you need to use a FireWire device, but don't forget to unload them! diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index bac354b4724bb..086e5d65da2f2 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -495,6 +495,8 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then fi fi +@postResumeCommands@ + # If we have a path to an iso file, find the iso and link it to /dev/root if [ -n "$isoPath" ]; then mkdir -p /findiso diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f139902cdc85b..13c71e1495ea9 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -284,7 +284,7 @@ let # in the NixOS installation CD, so use ID_CDROM_MEDIA in the # corresponding udev rules for now. This was the behaviour in # udev <= 154. See also - # http://www.spinics.net/lists/hotplug/msg03935.html + # https://www.spinics.net/lists/hotplug/msg03935.html substituteInPlace $out/60-persistent-storage.rules \ --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA ''; # */ @@ -316,7 +316,7 @@ let inherit (config.system.build) earlyMountScript; inherit (config.boot.initrd) checkJournalingFS verbose - preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; + preLVMCommands preDeviceCommands postDeviceCommands postResumeCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable @@ -527,6 +527,14 @@ in ''; }; + boot.initrd.postResumeCommands = mkOption { + default = ""; + type = types.lines; + description = lib.mdDoc '' + Shell commands to be executed immediately after attempting to resume. + ''; + }; + boot.initrd.postMountCommands = mkOption { default = ""; type = types.lines; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index be40b8e969a17..e223451652b2e 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -358,6 +358,7 @@ in { [ "preDeviceCommands" ] [ "preLVMCommands" ] [ "postDeviceCommands" ] + [ "postResumeCommands" ] [ "postMountCommands" ] [ "extraUdevRulesCommands" ] [ "extraUtilsCommands" ] diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index 773163bbcb811..7e62a4c9bfedf 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -28,6 +28,15 @@ in { ''; }; + services.journald.storage = mkOption { + default = "persistent"; + type = types.enum [ "persistent" "volatile" "auto" "none" ]; + description = mdDoc '' + Controls where to store journal data. See + {manpage}`journald.conf(5)` for further information. + ''; + }; + services.journald.rateLimitBurst = mkOption { default = 10000; type = types.int; @@ -100,7 +109,7 @@ in { environment.etc = { "systemd/journald.conf".text = '' [Journal] - Storage=persistent + Storage=${cfg.storage} RateLimitInterval=${cfg.rateLimitInterval} RateLimitBurst=${toString cfg.rateLimitBurst} ${optionalString (cfg.console != "") '' diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index c91e54f5a4d78..abe68dd6eae68 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -6,49 +6,109 @@ with lib; let + cfg = config.testing; + qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; + + backdoorService = { + wantedBy = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; + before = [ "shutdown.target" "initrd-switch-root.target" ]; + requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + script = + '' + export USER=root + export HOME=/root + export DISPLAY=:0.0 + + if [[ -e /etc/profile ]]; then + source /etc/profile + fi + + # Don't use a pager when executing backdoor + # actions. Because we use a tty, commands like systemctl + # or nix-store get confused into thinking they're running + # interactively. + export PAGER= + + cd /tmp + exec < /dev/hvc0 > /dev/hvc0 + while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done + echo "connecting to host..." >&2 + stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion + # The following line is essential since it signals to + # the test driver that the shell is ready. + # See: the connect method in the Machine class. + echo "Spawning backdoor root shell..." + # Passing the terminal device makes bash run non-interactively. + # Otherwise we get errors on the terminal because bash tries to + # setup things like job control. + # Note: calling bash explicitly here instead of sh makes sure that + # we can also run non-NixOS guests during tests. + PS1= exec /usr/bin/env bash --norc /dev/hvc0 + ''; + serviceConfig.KillSignal = "SIGHUP"; + }; + in { - config = { + options.testing = { - systemd.services.backdoor = - { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - script = - '' - export USER=root - export HOME=/root - export DISPLAY=:0.0 + initrdBackdoor = lib.mkEnableOption (lib.mdDoc '' + enable backdoor.service in initrd. Requires + boot.initrd.systemd.enable to be enabled. Boot will pause in + stage 1 at initrd.target, and will listen for commands from the + Machine python interface, just like stage 2 normally does. This + enables commands to be sent to test and debug stage 1. Use + machine.switch_root() to leave stage 1 and proceed to stage 2. + ''); - source /etc/profile + }; - # Don't use a pager when executing backdoor - # actions. Because we use a tty, commands like systemctl - # or nix-store get confused into thinking they're running - # interactively. - export PAGER= - - cd /tmp - exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done - echo "connecting to host..." >&2 - stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion - # The following line is essential since it signals to - # the test driver that the shell is ready. - # See: the connect method in the Machine class. - echo "Spawning backdoor root shell..." - # Passing the terminal device makes bash run non-interactively. - # Otherwise we get errors on the terminal because bash tries to - # setup things like job control. - # Note: calling bash explicitly here instead of sh makes sure that - # we can also run non-NixOS guests during tests. - PS1= exec /usr/bin/env bash --norc /dev/hvc0 - ''; - serviceConfig.KillSignal = "SIGHUP"; - }; + config = { + + assertions = [ + { + assertion = cfg.initrdBackdoor -> config.boot.initrd.systemd.enable; + message = '' + testing.initrdBackdoor requires boot.initrd.systemd.enable to be enabled. + ''; + } + ]; + + systemd.services.backdoor = backdoorService; + + boot.initrd.systemd = lib.mkMerge [ + { + contents."/etc/systemd/journald.conf".text = '' + [Journal] + ForwardToConsole=yes + MaxLevelConsole=debug + ''; + + extraConfig = config.systemd.extraConfig; + } + + (lib.mkIf cfg.initrdBackdoor { + # Implemented in machine.switch_root(). Suppress the unit by + # making it a noop without removing it, which would break + # initrd-parse-etc.service + services.initrd-cleanup.serviceConfig.ExecStart = [ + # Reset + "" + # noop + "/bin/true" + ]; + + services.backdoor = backdoorService; + + contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env"; + }) + ]; # Prevent agetty from being instantiated on the serial device, since it # interferes with the backdoor (writes to it will randomly fail @@ -104,12 +164,6 @@ in MaxLevelConsole=debug ''; - boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = '' - [Journal] - ForwardToConsole=yes - MaxLevelConsole=debug - ''; - systemd.extraConfig = '' # Don't clobber the console with duplicate systemd messages. ShowStatus=no @@ -123,8 +177,6 @@ in DefaultDeviceTimeoutSec=300 ''; - boot.initrd.systemd.extraConfig = config.systemd.extraConfig; - boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 6e6021cf80fe3..a88b78bc98219 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -241,7 +241,16 @@ in after = [ "network-online.target" "sshd.service" ]; wants = [ "network-online.target" ]; - path = [ pkgs.e2fsprogs pkgs.bash ]; + path = [ + pkgs.e2fsprogs + pkgs.bash + + # waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3 + pkgs.python3 + + # waagent's Microsoft.CPlat.Core.RunCommandLinux needs lsof + pkgs.lsof + ]; description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 3c503f027d798..887af26949feb 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -84,6 +84,10 @@ in { groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } ]; + security.sudo-rs.extraRules = mkIf config.users.mutableUsers [ + { groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } + ]; + users.groups.google-sudoers = mkIf config.users.mutableUsers { }; boot.extraModprobeConfig = readFile "${pkgs.google-guest-configs}/etc/modprobe.d/gce-blacklist.conf"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 197ebb18b9ad2..dcdd1b59eef53 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -44,10 +44,17 @@ in GZIP compression level of the resulting disk image (1-9). ''; }; + virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting"; }; #### implementation config = { + boot.initrd.availableKernelModules = [ "nvme" ]; + boot.loader.grub = mkIf cfg.efi { + device = mkForce "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -62,6 +69,7 @@ in ''; format = "raw"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; + partitionTableType = if cfg.efi then "efi" else "legacy"; inherit (cfg) diskSize; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 4ee5b0badded6..a4a40346f093b 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -252,11 +252,10 @@ let text = '' ${cfg.backend} rm -f ${name} || true ${optionalString (isValidLogin container.login) '' - cat ${container.login.passwordFile} | \ ${cfg.backend} login \ ${container.login.registry} \ --username ${container.login.username} \ - --password-stdin + --password-stdin < ${container.login.passwordFile} ''} ${optionalString (container.imageFile != null) '' ${cfg.backend} load -i ${container.imageFile} diff --git a/nixos/tests/castopod.nix b/nixos/tests/castopod.nix index 1d53c3e9a3e61..4435ec617d4e6 100644 --- a/nixos/tests/castopod.nix +++ b/nixos/tests/castopod.nix @@ -82,6 +82,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: castopod.succeed("curl -s http://localhost/cp-install | grep 'Create your Super Admin account' > /dev/null") with subtest("Create superadmin and log in"): - castopod.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + castopod.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") ''; }) diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index f574b59be5452..f62c72bddddca 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -26,7 +26,7 @@ let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { name = "${giteaPackage.pname}-${type}"; - meta.maintainers = with maintainers; [ aanderse emilylange kolaente ma27 ]; + meta.maintainers = with maintainers; [ aanderse kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { diff --git a/nixos/tests/hadoop/hadoop.nix b/nixos/tests/hadoop/hadoop.nix index 0de2366b1864c..6162ccfd33d47 100644 --- a/nixos/tests/hadoop/hadoop.nix +++ b/nixos/tests/hadoop/hadoop.nix @@ -176,22 +176,22 @@ import ../make-test-python.nix ({ package, ... }: { nn2.succeed("systemctl stop hdfs-zkfc") # Initialize zookeeper for failover controller - nn1.succeed("sudo -u hdfs hdfs zkfc -formatZK 2>&1 | systemd-cat") + nn1.succeed("sudo -u hdfs systemd-cat hdfs zkfc -formatZK") # Format NN1 and start it - nn1.succeed("sudo -u hdfs hadoop namenode -format 2>&1 | systemd-cat") + nn1.succeed("sudo -u hdfs systemd-cat hadoop namenode -format") nn1.succeed("systemctl start hdfs-namenode") nn1.wait_for_open_port(9870) nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) # Bootstrap NN2 from NN1 and start it - nn2.succeed("sudo -u hdfs hdfs namenode -bootstrapStandby 2>&1 | systemd-cat") + nn2.succeed("sudo -u hdfs systemd-cat hdfs namenode -bootstrapStandby") nn2.succeed("systemctl start hdfs-namenode") nn2.wait_for_open_port(9870) nn2.wait_for_open_port(8022) nn2.wait_for_open_port(8020) - nn1.succeed("netstat -tulpne | systemd-cat") + nn1.succeed("systemd-cat netstat -tulpne") # Start failover controllers nn1.succeed("systemctl start hdfs-zkfc") @@ -200,10 +200,10 @@ import ../make-test-python.nix ({ package, ... }: { # DN should have started by now, but confirm anyway dn1.wait_for_unit("hdfs-datanode") # Print states of namenodes - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") # Wait for cluster to exit safemode client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") # test R/W client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") @@ -211,7 +211,7 @@ import ../make-test-python.nix ({ package, ... }: { # Test NN failover nn1.succeed("systemctl stop hdfs-namenode") assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") nn1.succeed("systemctl start hdfs-namenode") @@ -219,7 +219,7 @@ import ../make-test-python.nix ({ package, ... }: { nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") #### YARN tests #### @@ -236,18 +236,18 @@ import ../make-test-python.nix ({ package, ... }: { nm1.wait_for_open_port(8042) nm1.wait_for_open_port(8040) client.wait_until_succeeds("yarn node -list | grep Nodes:1") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - client.succeed("sudo -u yarn yarn node -list | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn systemd-cat yarn node -list") # Test RM failover rm1.succeed("systemctl stop yarn-resourcemanager") assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") rm1.succeed("systemctl start yarn-resourcemanager") rm1.wait_for_unit("yarn-resourcemanager") rm1.wait_for_open_port(8088) assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") 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/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index 429d4bf6b5389..65686b3715598 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -50,8 +50,8 @@ import ../make-test-python.nix ({ package, lib, ... }: namenode.wait_for_unit("hdfs-namenode") namenode.wait_for_unit("network.target") namenode.wait_for_open_port(8020) - namenode.succeed("ss -tulpne | systemd-cat") - namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat") + namenode.succeed("systemd-cat ss -tulpne") + namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml") namenode.wait_for_open_port(9870) datanode.wait_for_unit("hdfs-datanode") diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index b7deb95b2c194..e97e8a467b187 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -43,6 +43,16 @@ in { psycopg2 ]; + # test loading custom components + customComponents = with pkgs.home-assistant-custom-components; [ + prometheus-sensor + ]; + + # test loading lovelace modules + customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [ + mini-graph-card + ]; + config = { homeassistant = { name = "Home"; @@ -114,6 +124,14 @@ in { inheritParentConfig = true; configuration.services.home-assistant.config.backup = {}; }; + + specialisation.removeCustomThings = { + inheritParentConfig = true; + configuration.services.home-assistant = { + customComponents = lib.mkForce []; + customLovelaceModules = lib.mkForce []; + }; + }; }; testScript = { nodes, ... }: let @@ -161,6 +179,14 @@ in { hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") + with subtest("Check that custom components get installed"): + hass.succeed("test -f ${configDir}/custom_components/prometheus_sensor/manifest.json") + hass.wait_until_succeeds("journalctl -u home-assistant.service | grep -q 'We found a custom integration prometheus_sensor which has not been tested by Home Assistant'") + + with subtest("Check that lovelace modules are referenced and fetchable"): + hass.succeed("grep -q 'mini-graph-card-bundle.js' '${configDir}/ui-lovelace.yaml'") + hass.succeed("curl --fail http://localhost:8123/local/nixos-lovelace-modules/mini-graph-card-bundle.js") + with subtest("Check that optional dependencies are in the PYTHONPATH"): env = get_unit_property("Environment") python_path = env.split("PYTHONPATH=")[1].split()[0] @@ -200,6 +226,13 @@ in { for domain in ["backup"]: assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" + with subtest("Check custom components and custom lovelace modules get removed"): + cursor = get_journal_cursor() + hass.succeed("${system}/specialisation/removeCustomThings/bin/switch-to-configuration test") + hass.fail("grep -q 'mini-graph-card-bundle.js' '${configDir}/ui-lovelace.yaml'") + hass.fail("test -f ${configDir}/custom_components/prometheus_sensor/manifest.json") + wait_for_homeassistant(cursor) + with subtest("Check that no errors were logged"): hass.fail("journalctl -u home-assistant -o cat | grep -q ERROR") diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix index 92ae9990c9477..494a539b57e00 100644 --- a/nixos/tests/iscsi-multipath-root.nix +++ b/nixos/tests/iscsi-multipath-root.nix @@ -202,7 +202,7 @@ import ./make-test-python.nix ( initiatorAuto.succeed("umount /mnt") initiatorAuto.succeed("systemctl restart multipathd") - initiatorAuto.succeed("multipath -ll | systemd-cat") + initiatorAuto.succeed("systemd-cat multipath -ll") # Install our RootDisk machine to 123456, the alias to the device that multipath is now managing initiatorAuto.succeed("mount /dev/mapper/123456 /mnt") @@ -223,7 +223,7 @@ import ./make-test-python.nix ( initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") initiatorRootDisk.succeed("systemctl restart multipathd") - initiatorRootDisk.succeed("multipath -ll | systemd-cat") + initiatorRootDisk.succeed("systemd-cat multipath -ll") # Verify we can write and sync the root disk initiatorRootDisk.succeed("mkdir /scratch") diff --git a/nixos/tests/mobilizon.nix b/nixos/tests/mobilizon.nix index 2b070ca9d9609..398c8530dc565 100644 --- a/nixos/tests/mobilizon.nix +++ b/nixos/tests/mobilizon.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ... }: meta.maintainers = with lib.maintainers; [ minijackson erictapen ]; nodes.server = - { ... }: + { pkgs, ... }: { services.mobilizon = { enable = true; @@ -25,6 +25,8 @@ import ./make-test-python.nix ({ lib, ... }: }; }; + services.postgresql.package = pkgs.postgresql_14; + security.pki.certificateFiles = [ certs.ca.cert ]; services.nginx.virtualHosts."${mobilizonDomain}" = { diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 881eb9d7d91c5..799497477993b 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -103,7 +103,12 @@ in { testScript = '' start_all() - server.wait_for_unit("sshd") + server.wait_for_unit("sshd", timeout=30) + server_localhost_only.wait_for_unit("sshd", timeout=30) + server_match_rule.wait_for_unit("sshd", timeout=30) + + server_lazy.wait_for_unit("sshd.socket", timeout=30) + server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30) with subtest("manual-authkey"): client.succeed("mkdir -m 700 /root/.ssh") diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 54fdc1d3995ca..4111720cf6be8 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -4,6 +4,7 @@ import ./make-test-python.nix ( let remoteRepository = "/root/restic-backup"; remoteFromFileRepository = "/root/restic-backup-from-file"; + remoteNoInitRepository = "/root/restic-backup-no-init"; rcloneRepository = "rclone:local:/root/restic-rclone-backup"; backupPrepareCommand = '' @@ -54,6 +55,7 @@ import ./make-test-python.nix ( inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; repository = remoteRepository; initialize = true; + timerConfig = null; # has no effect here, just checking that it doesn't break the service }; remote-from-file-backup = { inherit passwordFile exclude pruneOpts; @@ -64,6 +66,11 @@ import ./make-test-python.nix ( find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir ''; }; + remote-noinit-backup = { + inherit passwordFile exclude pruneOpts paths; + initialize = false; + repository = remoteNoInitRepository; + }; rclonebackup = { inherit passwordFile paths exclude pruneOpts; initialize = true; @@ -114,6 +121,7 @@ import ./make-test-python.nix ( "cp -rT ${testDir} /opt", "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /root/restic-rclone-backup", + "restic-remote-noinit-backup init", # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", @@ -130,6 +138,10 @@ import ./make-test-python.nix ( "systemctl start restic-backups-remote-from-file-backup.service", 'restic-remote-from-file-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that remote-noinit-backup produces a snapshot + "systemctl start restic-backups-remote-noinit-backup.service", + 'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that restoring that snapshot produces the same directory "mkdir /tmp/restore-2", "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-2", diff --git a/nixos/tests/shattered-pixel-dungeon.nix b/nixos/tests/shattered-pixel-dungeon.nix index a256bbdfd7357..b4ac1670b5cad 100644 --- a/nixos/tests/shattered-pixel-dungeon.nix +++ b/nixos/tests/shattered-pixel-dungeon.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_x() machine.execute("shattered-pixel-dungeon >&2 &") machine.wait_for_window(r"Shattered Pixel Dungeon") - machine.sleep(5) - if "Enter" not in machine.get_screen_text(): - raise Exception("Program did not start successfully") + machine.wait_for_text("Enter") machine.screenshot("screen") ''; }) diff --git a/nixos/tests/sourcehut.nix b/nixos/tests/sourcehut.nix index 87e6d82bdd8f4..0b258acc2af1d 100644 --- a/nixos/tests/sourcehut.nix +++ b/nixos/tests/sourcehut.nix @@ -126,6 +126,7 @@ in virtualisation.diskSize = 4 * 1024; virtualisation.memorySize = 2 * 1024; networking.domain = domain; + networking.enableIPv6 = false; networking.extraHosts = '' ${config.networking.primaryIPAddress} builds.${domain} ${config.networking.primaryIPAddress} git.${domain} @@ -134,11 +135,6 @@ in services.sourcehut = { enable = true; - services = [ - "builds" - "git" - "meta" - ]; nginx.enable = true; nginx.virtualHost = { forceSSL = true; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 1b177391488d8..1fe478f0bff14 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -21,7 +21,8 @@ in }; security.sudo = { - enable = true; + # Explicitly _not_ defining 'enable = true;' here, to check that sudo is enabled by default + wheelNeedsPassword = false; extraConfig = '' diff --git a/nixos/tests/systemd-initrd-modprobe.nix b/nixos/tests/systemd-initrd-modprobe.nix index bf635a10d0e97..0f93492176b44 100644 --- a/nixos/tests/systemd-initrd-modprobe.nix +++ b/nixos/tests/systemd-initrd-modprobe.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-modprobe"; nodes.machine = { pkgs, ... }: { + testing.initrdBackdoor = true; boot.initrd.systemd.enable = true; boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd. boot.extraModprobeConfig = '' @@ -10,6 +11,12 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; testScript = '' + machine.wait_for_unit("initrd.target") + max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") + assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + + # Make sure it sticks in stage 2 + machine.switch_root() machine.wait_for_unit("multi-user.target") max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" diff --git a/nixos/tests/systemd-initrd-networkd-ssh.nix b/nixos/tests/systemd-initrd-networkd-ssh.nix index 6aaa6c828f7bd..d4c168f40e29d 100644 --- a/nixos/tests/systemd-initrd-networkd-ssh.nix +++ b/nixos/tests/systemd-initrd-networkd-ssh.nix @@ -4,34 +4,16 @@ import ./make-test-python.nix ({ lib, ... }: { nodes = { server = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.cryptsetup ]; - boot.loader.systemd-boot.enable = true; - boot.loader.timeout = 0; - virtualisation = { - emptyDiskImages = [ 4096 ]; - useBootLoader = true; - # Booting off the encrypted disk requires an available init script from - # the Nix store - mountHostNixStore = true; - useEFIBoot = true; - }; - - specialisation.encrypted-root.configuration = { - virtualisation.rootDevice = "/dev/mapper/root"; - virtualisation.fileSystems."/".autoFormat = true; - boot.initrd.luks.devices = lib.mkVMOverride { - root.device = "/dev/vdb"; - }; - boot.initrd.systemd.enable = true; - boot.initrd.network = { + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; + boot.initrd.systemd.contents."/etc/msg".text = "foo"; + boot.initrd.network = { + enable = true; + ssh = { enable = true; - ssh = { - enable = true; - authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; - port = 22; - # Terrible hack so it works with useBootLoader - hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ]; - }; + authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; + port = 22; + hostKeys = [ ./initrd-network-ssh/ssh_host_ed25519_key ]; }; }; }; @@ -63,24 +45,16 @@ import ./make-test-python.nix ({ lib, ... }: { status, _ = client.execute("nc -z server 22") return status == 0 - server.wait_for_unit("multi-user.target") - server.succeed( - "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb", - "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf", - "sync", - ) - server.shutdown() - server.start() - client.wait_for_unit("network.target") with client.nested("waiting for SSH server to come up"): retry(ssh_is_up) - client.succeed( - "echo somepass | ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'systemd-tty-ask-password-agent' & exit" + msg = client.succeed( + "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'cat /etc/msg'" ) + assert "foo" in msg + server.switch_root() server.wait_for_unit("multi-user.target") - server.succeed("mount | grep '/dev/mapper/root on /'") ''; }) diff --git a/nixos/tests/systemd-initrd-networkd.nix b/nixos/tests/systemd-initrd-networkd.nix index 8376276d8f63d..9c4ddb6e4b363 100644 --- a/nixos/tests/systemd-initrd-networkd.nix +++ b/nixos/tests/systemd-initrd-networkd.nix @@ -1,14 +1,36 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "systemd-initrd-network"; - meta.maintainers = [ lib.maintainers.elvishjerricco ]; +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +}: - nodes = let - mkFlushTest = flush: script: { ... }: { - boot.initrd.systemd.enable = true; - boot.initrd.network = { - enable = true; - flushBeforeStage2 = flush; - }; +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + inherit (lib.maintainers) elvishjerricco; + + common = { + boot.initrd.systemd = { + enable = true; + network.wait-online.timeout = 10; + network.wait-online.anyInterface = true; + targets.network-online.requiredBy = [ "initrd.target" ]; + services.systemd-networkd-wait-online.requiredBy = + [ "network-online.target" ]; + initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; + }; + testing.initrdBackdoor = true; + boot.initrd.network.enable = true; + }; + + mkFlushTest = flush: script: makeTest { + name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush"; + meta.maintainers = [ elvishjerricco ]; + + nodes.machine = { + imports = [ common ]; + + boot.initrd.network.flushBeforeStage2 = flush; systemd.services.check-flush = { requiredBy = ["multi-user.target"]; before = ["network-pre.target" "multi-user.target"]; @@ -19,57 +41,53 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { inherit script; }; }; - in { - basic = { ... }: { - boot.initrd.network.enable = true; - boot.initrd.systemd = { - enable = true; - # Enable network-online to fail the test in case of timeout - network.wait-online.timeout = 10; - network.wait-online.anyInterface = true; - targets.network-online.requiredBy = [ "initrd.target" ]; - services.systemd-networkd-wait-online.requiredBy = - [ "network-online.target" ]; + testScript = '' + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() - initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - services.check = { - requiredBy = [ "initrd.target" ]; - before = [ "initrd.target" ]; - after = [ "network-online.target" ]; - serviceConfig.Type = "oneshot"; - path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - script = '' - ip addr | grep 10.0.2.15 || exit 1 - ping -c1 10.0.2.2 || exit 1 - ''; - }; - }; - }; - - doFlush = mkFlushTest true '' - if ip addr | grep 10.0.2.15; then - echo "Network configuration survived switch-root; flushBeforeStage2 failed" - exit 1 - fi + machine.wait_for_unit("multi-user.target") ''; + }; + +in { + basic = makeTest { + name = "systemd-initrd-network"; + meta.maintainers = [ elvishjerricco ]; - dontFlush = mkFlushTest false '' - if ! (ip addr | grep 10.0.2.15); then - echo "Network configuration didn't survive switch-root" - exit 1 - fi + nodes.machine = common; + + testScript = '' + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() + + # Make sure the systemd-network user was set correctly in initrd + machine.wait_for_unit("multi-user.target") + machine.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") + machine.succeed("ip addr show >&2") + machine.succeed("ip route show >&2") ''; }; - testScript = '' - start_all() - basic.wait_for_unit("multi-user.target") - doFlush.wait_for_unit("multi-user.target") - dontFlush.wait_for_unit("multi-user.target") - # Make sure the systemd-network user was set correctly in initrd - basic.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") - basic.succeed("ip addr show >&2") - basic.succeed("ip route show >&2") + doFlush = mkFlushTest true '' + if ip addr | grep 10.0.2.15; then + echo "Network configuration survived switch-root; flushBeforeStage2 failed" + exit 1 + fi + ''; + + dontFlush = mkFlushTest false '' + if ! (ip addr | grep 10.0.2.15); then + echo "Network configuration didn't survive switch-root" + exit 1 + fi ''; -}) +} diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index a6a22e9d48e06..2b7283a821939 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -2,16 +2,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-simple"; nodes.machine = { pkgs, ... }: { - boot.initrd.systemd = { - enable = true; - emergencyAccess = true; - }; + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; virtualisation.fileSystems."/".autoResize = true; }; testScript = '' import subprocess + with subtest("testing initrd backdoor"): + machine.wait_for_unit("initrd.target") + machine.succeed("systemctl status initrd-fs.target") + machine.switch_root() + with subtest("handover to stage-2 systemd works"): machine.wait_for_unit("multi-user.target") machine.succeed("systemd-analyze | grep -q '(initrd)'") # direct handover @@ -37,6 +40,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) machine.start() + machine.switch_root() newAvail = machine.succeed("df --output=avail / | sed 1d") assert int(oldAvail) < int(newAvail), "File system did not grow" diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 6c423f4140b1f..6b241b93d5118 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -65,7 +65,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd"; meta = with pkgs.lib.maintainers; { - maintainers = [ ninjatrappeur ]; + maintainers = [ picnoir ]; }; nodes = { node1 = { pkgs, ... }@attrs: diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix index 54456238fe634..f3369da99a055 100644 --- a/nixos/tests/tandoor-recipes.nix +++ b/nixos/tests/tandoor-recipes.nix @@ -3,33 +3,8 @@ import ./make-test-python.nix ({ lib, ... }: { meta.maintainers = with lib.maintainers; [ ambroisie ]; nodes.machine = { pkgs, ... }: { - # Setup using Postgres services.tandoor-recipes = { enable = true; - - extraConfig = { - DB_ENGINE = "django.db.backends.postgresql"; - POSTGRES_HOST = "/run/postgresql"; - POSTGRES_USER = "tandoor_recipes"; - POSTGRES_DB = "tandoor_recipes"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "tandoor_recipes" ]; - ensureUsers = [ - { - name = "tandoor_recipes"; - ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES"; - } - ]; - }; - - systemd.services = { - tandoor-recipes = { - after = [ "postgresql.service" ]; - }; }; }; diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 95d00c1d8ec14..9d2f0e6ab060e 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -54,9 +54,8 @@ let services.postgresql = { enable = true; initialScript = pkgs.writeText "postgresql-init.sql" '' - CREATE DATABASE bitwarden; CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; - GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser; + CREATE DATABASE bitwarden WITH OWNER bitwardenuser; ''; }; @@ -174,7 +173,7 @@ let ) with subtest("use the web interface to sign up, log in, and save a password"): - server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + server.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") with subtest("log in with the cli"): key = client.succeed( diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix index ee1100f2161fd..5da2fa6ee0256 100644 --- a/pkgs/applications/audio/feishin/darwin.nix +++ b/pkgs/applications/audio/feishin/darwin.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-6GYp9uzlR1eVRYhNU3kOmcUOPFY3J9eJPqN+TucNavA="; + hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index 3801d31e0a567..c89d5163c2a6d 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -8,7 +8,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; pname = "feishin"; - version = "0.4.1"; + version = "0.5.1"; appname = "Feishin"; meta = with lib; { diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix index 8c5890524c356..d503492adfc9e 100644 --- a/pkgs/applications/audio/feishin/linux.nix +++ b/pkgs/applications/audio/feishin/linux.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-Y8r329rO7z8V2xP/uRsjTFJfvTn+zyeAYzq6fKDxXs4="; + hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; }; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 120a72dbd50f5..7eaac915a5acc 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -95,6 +95,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://gpodder.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ skeidel mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index a16ad3c932017..ba73a5aae109b 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/gtkpod/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 86d20ea5e83b1..417dd8e41a651 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy, unstableGitUpdater }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2023-04-21"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "984151ac96c5f9c35892055bff20cc11f46092d5"; - hash = "sha256-4e9Aj0AOFR4/FK54gr1ZyPt0nYZDMrMetV4FPtBxapU="; + rev = "48faaaa2642647b0152231798b46ccd9631694f5"; + hash = "sha256-RwkUdcbDU7/ndVnPteG/iXB2dloljvCHQlvPk4tacuA="; }; propagatedBuildInputs = [ @@ -22,6 +22,8 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_spotify" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-spotify"; description = "Mopidy extension for playing music from Spotify"; diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index 75cf863fc7699..e011804944b53 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs="; + sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 37bc49bee2b38..daafc48deb7a1 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-h5t5DpZD9zmmyGRueXBG5Pn+vZstm5yCUr6Mx3eyvsc="; + sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix index 3ce65da9f34d2..0a258b0cb9c1f 100644 --- a/pkgs/applications/audio/pbpctrl/default.nix +++ b/pkgs/applications/audio/pbpctrl/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pbpctrl"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "qzed"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-91sdlnffL/HX+Y8e6T+ZCa7MAcf4fWE0NJGLgmK47o8="; + hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI="; }; - cargoHash = "sha256-U4//GvAEhrfOrivwW/6PbKHdWXGIuilPl7Zo17wnwDY="; + cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ dbus ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 9dcafa4eb0b51..1e9e26cb18a4b 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.17"; + version = "6.3.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-HArWXUYoIjJmvh0GOcdGyBHfqC5r4ZEuvXyQ1x5iOt0="; + hash = "sha256-hVQPLRyDXrqpheAqzC/hQ/ZaFxP1c7ClAJQs3wlEcGc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 645ba0e168624..44a285c7b65a4 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; + sha256 = "sha256-wJ+vUw16yBBFjMdJogF1nkLnAh3o2ndN9+0png8ZVJ4="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 90348e7b80b11..8ae8001b6e5c0 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "spectmorph"; - version = "0.5.2"; + version = "0.6.1"; src = fetchurl { - url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; + url = "https://github.com/swesterfeld/spectmorph/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-H/PaczAkjxeu2Q6S/jazZ0PU9oCmhBzsLgbGLusxXm8="; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index c676e6a774b53..7d499ff1664e8 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-NKa6lOP3fpAFMYwzZAMFgW0tBSM/F89oB/nDbEUeflw="; + sha256 = "sha256-6TPZMDhGHqXjY8UYEqlr4hweF+W19IpIfSa9Bo9Ta1A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index fffa95566bf4a..8ba06230bb277 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.69.0"; + version = "2.71.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI="; + hash = "sha256-boZ28o8bg2TXZcc1mx4ZlPIPRFK9wy4+MTbYLT5XCQU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index b5f10b26d6945..a2b4766cfe593 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "cipher 0.3.0", "ctr 0.8.0", "ghash 0.4.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -130,7 +130,7 @@ dependencies = [ "cipher 0.4.4", "ctr 0.9.2", "ghash 0.5.0", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -267,9 +267,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -317,26 +317,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "ark-algebra-test-templates" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400bd3a79c741b1832f1416d4373ae077ef82ca14a8b4cee1248a2f11c8b9172" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", - "hex", - "num-bigint", - "num-integer", - "num-traits", - "serde", - "serde_derive", - "serde_json", - "sha2 0.10.7", -] - -[[package]] name = "ark-bls12-377" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -469,51 +449,23 @@ dependencies = [ ] [[package]] -name = "ark-r1cs-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1d1472e5cb020cb3405ce2567c91c8d43f21b674aef37b0202f5c3304761db" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-relations", - "ark-std", - "derivative", - "num-bigint", - "num-integer", - "num-traits", - "tracing", -] - -[[package]] -name = "ark-relations" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0" -dependencies = [ - "ark-ff", - "ark-std", - "tracing", - "tracing-subscriber", -] - -[[package]] name = "ark-scale" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" dependencies = [ "ark-ec", "ark-ff", "ark-serialize", "ark-std", "parity-scale-codec", + "scale-info", ] [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" dependencies = [ "ark-ec", "ark-ff", @@ -561,7 +513,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" dependencies = [ "ark-ff", "ark-serialize", @@ -573,6 +525,12 @@ dependencies = [ [[package]] name = "array-bytes" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + +[[package]] +name = "array-bytes" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" @@ -693,31 +651,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] -name = "asset-hub-kusama-integration-tests" -version = "1.0.0" +name = "asset-hub-kusama-runtime" +version = "0.9.420" dependencies = [ - "assert_matches", - "asset-hub-kusama-runtime", + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", "frame-support", "frame-system", - "integration-tests-common", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "log", "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", "pallet-assets", + "pallet-aura", + "pallet-authorship", "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", - "polkadot-runtime", - "polkadot-runtime-parachains", + "polkadot-runtime-common", + "primitive-types", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-genesis-builder", + "sp-inherents", + "sp-offchain", "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "sp-weights", "staging-xcm", - "xcm-emulator", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", ] [[package]] -name = "asset-hub-kusama-runtime" +name = "asset-hub-polkadot-runtime" version = "0.9.420" dependencies = [ "asset-test-utils", @@ -738,22 +745,18 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", "log", - "pallet-asset-conversion", - "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", "pallet-assets", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-multisig", - "pallet-nft-fractionalization", "pallet-nfts", "pallet-nfts-runtime-api", "pallet-proxy", "pallet-session", - "pallet-state-trie-migration", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -767,7 +770,6 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-common", - "primitive-types", "scale-info", "smallvec", "sp-api", @@ -791,10 +793,12 @@ dependencies = [ ] [[package]] -name = "asset-hub-polkadot-integration-tests" +name = "asset-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ - "asset-hub-kusama-runtime", + "assert_matches", + "asset-hub-rococo-runtime", + "asset-test-utils", "frame-support", "frame-system", "integration-tests-common", @@ -806,19 +810,24 @@ dependencies = [ "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", - "polkadot-runtime", "polkadot-runtime-parachains", + "rococo-runtime", "sp-runtime", "staging-xcm", + "staging-xcm-executor", "xcm-emulator", ] [[package]] -name = "asset-hub-polkadot-runtime" +name = "asset-hub-rococo-runtime" version = "0.9.420" dependencies = [ "asset-test-utils", "assets-common", + "bp-asset-hub-rococo", + "bp-asset-hub-wococo", + "bp-bridge-hub-rococo", + "bp-bridge-hub-wococo", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -836,17 +845,20 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "pallet-asset-tx-payment", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", "pallet-assets", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-multisig", + "pallet-nft-fractionalization", "pallet-nfts", "pallet-nfts-runtime-api", "pallet-proxy", "pallet-session", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -854,20 +866,21 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub-router", "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-common", - "polkadot-runtime-constants", + "primitive-types", + "rococo-runtime-constants", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", "sp-core", - "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -889,21 +902,30 @@ version = "1.0.0" dependencies = [ "assert_matches", "asset-hub-westend-runtime", + "asset-test-utils", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", "frame-support", "frame-system", "integration-tests-common", "pallet-asset-conversion", + "pallet-asset-rate", "pallet-assets", "pallet-balances", + "pallet-treasury", "pallet-xcm", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", - "polkadot-runtime", + "polkadot-runtime-common", "polkadot-runtime-parachains", "sp-runtime", "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "westend-runtime", + "westend-runtime-constants", "xcm-emulator", ] @@ -999,6 +1021,7 @@ dependencies = [ "pallet-collator-selection", "pallet-session", "pallet-xcm", + "pallet-xcm-bridge-hub-router", "parachain-info", "parachains-common", "parachains-runtimes-test-utils", @@ -1010,6 +1033,7 @@ dependencies = [ "sp-runtime", "sp-std", "staging-xcm", + "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", ] @@ -1134,17 +1158,6 @@ dependencies = [ ] [[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.37", -] - -[[package]] name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1163,7 +1176,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1180,7 +1193,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1243,7 +1256,7 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1319,7 +1332,7 @@ dependencies = [ name = "binary-merkle-tree" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "env_logger 0.9.3", "hash-db", "log", @@ -1354,7 +1367,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1398,6 +1411,18 @@ dependencies = [ [[package]] name = "blake2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +dependencies = [ + "byte-tools", + "crypto-mac 0.7.0", + "digest 0.8.1", + "opaque-debug 0.2.3", +] + +[[package]] +name = "blake2" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" @@ -1564,6 +1589,26 @@ dependencies = [ ] [[package]] +name = "bp-asset-hub-rococo" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "bp-asset-hub-wococo" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", +] + +[[package]] name = "bp-bridge-hub-cumulus" version = "0.1.0" dependencies = [ @@ -1705,6 +1750,23 @@ dependencies = [ ] [[package]] +name = "bp-polkadot-bulletin" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] name = "bp-polkadot-core" version = "0.1.0" dependencies = [ @@ -1835,7 +1897,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", "log", "pallet-aura", "pallet-authorship", @@ -1918,7 +1979,6 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-common", - "polkadot-runtime-constants", "scale-info", "serde", "smallvec", @@ -1946,7 +2006,9 @@ dependencies = [ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ + "asset-test-utils", "bp-messages", + "bridge-hub-rococo-runtime", "cumulus-pallet-dmp-queue", "cumulus-pallet-xcmp-queue", "frame-support", @@ -1957,9 +2019,9 @@ dependencies = [ "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", - "polkadot-runtime", "polkadot-runtime-parachains", "staging-xcm", + "staging-xcm-executor", "xcm-emulator", ] @@ -1967,6 +2029,8 @@ dependencies = [ name = "bridge-hub-rococo-runtime" version = "0.1.0" dependencies = [ + "bp-asset-hub-rococo", + "bp-asset-hub-wococo", "bp-bridge-hub-rococo", "bp-bridge-hub-wococo", "bp-header-chain", @@ -2048,7 +2112,6 @@ dependencies = [ name = "bridge-hub-test-utils" version = "0.1.0" dependencies = [ - "assert_matches", "asset-test-utils", "bp-bridge-hub-rococo", "bp-bridge-hub-wococo", @@ -2086,6 +2149,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2210,6 +2274,16 @@ dependencies = [ ] [[package]] +name = "c2-chacha" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" +dependencies = [ + "cipher 0.2.5", + "ppv-lite86", +] + +[[package]] name = "camino" version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2265,7 +2339,7 @@ checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" dependencies = [ "aead 0.3.2", "cipher 0.2.5", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -2299,6 +2373,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862" +dependencies = [ + "byteorder", + "keystream", +] + +[[package]] name = "chacha20" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2339,7 +2423,7 @@ name = "chain-spec-builder" version = "2.0.0" dependencies = [ "ansi_term", - "clap 4.4.4", + "clap 4.4.6", "node-cli", "rand 0.8.5", "sc-chain-spec", @@ -2469,9 +2553,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive 4.4.2", @@ -2479,9 +2563,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -2495,7 +2579,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", ] [[package]] @@ -2520,7 +2604,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2561,32 +2645,6 @@ dependencies = [ ] [[package]] -name = "collectives-polkadot-integration-tests" -version = "0.1.0" -dependencies = [ - "collectives-polkadot-runtime", - "cumulus-pallet-parachain-system", - "cumulus-pallet-xcmp-queue", - "frame-support", - "integration-tests-common", - "pallet-assets", - "pallet-balances", - "pallet-core-fellowship", - "pallet-salary", - "pallet-xcm", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime", - "polkadot-runtime-parachains", - "sp-core", - "sp-runtime", - "staging-xcm", - "xcm-emulator", -] - -[[package]] name = "collectives-polkadot-runtime" version = "1.0.0" dependencies = [ @@ -2634,7 +2692,6 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-common", - "polkadot-runtime-constants", "scale-info", "smallvec", "sp-api", @@ -2712,7 +2769,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" +source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" dependencies = [ "ark-ec", "ark-ff", @@ -2824,7 +2881,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", "log", "pallet-aura", "pallet-authorship", @@ -2847,6 +2903,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-common", + "rococo-runtime-constants", "scale-info", "smallvec", "sp-api", @@ -3095,7 +3152,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.4", + "clap 4.4.6", "criterion-plot", "futures", "is-terminal", @@ -3191,7 +3248,7 @@ checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -3203,7 +3260,7 @@ checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -3220,12 +3277,22 @@ dependencies = [ [[package]] name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array 0.12.4", + "subtle 1.0.0", +] + +[[package]] +name = "crypto-mac" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -3235,7 +3302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -3260,7 +3327,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3560,6 +3627,7 @@ dependencies = [ "log", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-parachains", "sc-client-api", "scale-info", "sp-core", @@ -3584,7 +3652,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3634,6 +3702,7 @@ dependencies = [ name = "cumulus-pallet-xcmp-queue" version = "0.1.0" dependencies = [ + "bp-xcm-bridge-hub-router", "cumulus-pallet-parachain-system", "cumulus-primitives-core", "frame-benchmarking", @@ -3643,6 +3712,7 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "polkadot-runtime-common", + "polkadot-runtime-parachains", "rand_chacha 0.3.1", "scale-info", "sp-core", @@ -3739,8 +3809,10 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "log", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-runtime-common", + "polkadot-runtime-parachains", "sp-io", "sp-runtime", "sp-std", @@ -3798,7 +3870,7 @@ dependencies = [ name = "cumulus-relay-chain-minimal-node" version = "0.1.0" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -3820,11 +3892,11 @@ dependencies = [ "sc-service", "sc-tracing", "sc-utils", - "schnellru", "sp-api", "sp-consensus", "sp-consensus-babe", "sp-runtime", + "substrate-prometheus-endpoint", "tracing", ] @@ -3945,7 +4017,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.4.4", + "clap 4.4.6", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -4025,7 +4097,7 @@ dependencies = [ "byteorder", "digest 0.8.1", "rand_core 0.5.1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -4038,7 +4110,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -4055,7 +4127,7 @@ dependencies = [ "fiat-crypto", "platforms", "rustc_version 0.4.0", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -4067,7 +4139,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4107,7 +4179,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4124,7 +4196,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4370,7 +4442,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -4423,7 +4495,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4435,7 +4507,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" dependencies = [ "ark-ec", "ark-ff", @@ -4485,7 +4557,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.37", + "syn 2.0.38", "termcolor", "toml 0.7.6", "walkdir", @@ -4639,7 +4711,7 @@ dependencies = [ "pkcs8 0.9.0", "rand_core 0.6.4", "sec1 0.3.0", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -4658,7 +4730,7 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "sec1 0.7.3", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -4706,7 +4778,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4717,7 +4789,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4858,11 +4930,11 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" dependencies = [ - "blake2", + "blake2 0.10.6", "fs-err", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4959,7 +5031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -4969,7 +5041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -5119,10 +5191,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] +name = "frame" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", +] + +[[package]] name = "frame-benchmarking" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "frame-support", "frame-support-procedural", "frame-system", @@ -5150,9 +5230,9 @@ name = "frame-benchmarking-cli" version = "4.0.0-dev" dependencies = [ "Inflector", - "array-bytes", + "array-bytes 6.1.0", "chrono", - "clap 4.4.4", + "clap 4.4.6", "comfy-table", "frame-benchmarking", "frame-support", @@ -5218,7 +5298,7 @@ dependencies = [ "quote", "scale-info", "sp-arithmetic", - "syn 2.0.37", + "syn 2.0.38", "trybuild", ] @@ -5244,7 +5324,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5261,7 +5341,7 @@ dependencies = [ name = "frame-executive" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "frame-support", "frame-system", "frame-try-runtime", @@ -5295,7 +5375,6 @@ dependencies = [ name = "frame-remote-externalities" version = "0.10.0-dev" dependencies = [ - "async-recursion", "futures", "indicatif", "jsonrpsee", @@ -5318,7 +5397,7 @@ name = "frame-support" version = "4.0.0-dev" dependencies = [ "aquamarine", - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", "docify", @@ -5370,7 +5449,8 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.37", + "sp-core-hashing", + "syn 2.0.38", ] [[package]] @@ -5381,7 +5461,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5390,7 +5470,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5447,6 +5527,15 @@ dependencies = [ ] [[package]] +name = "frame-support-test-stg-frame-crate" +version = "0.1.0" +dependencies = [ + "frame", + "parity-scale-codec", + "scale-info", +] + +[[package]] name = "frame-system" version = "4.0.0-dev" dependencies = [ @@ -5613,7 +5702,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5733,10 +5822,8 @@ 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]] @@ -5802,6 +5889,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "frame-benchmarking", @@ -5846,7 +5934,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -5857,7 +5945,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff 0.13.0", "rand_core 0.6.4", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -5944,6 +6032,15 @@ dependencies = [ ] [[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6367,6 +6464,7 @@ version = "1.0.0" dependencies = [ "asset-hub-kusama-runtime", "asset-hub-polkadot-runtime", + "asset-hub-rococo-runtime", "asset-hub-westend-runtime", "bp-messages", "bridge-hub-kusama-runtime", @@ -6379,8 +6477,8 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "frame-support", - "kusama-runtime-constants", "pallet-assets", + "pallet-balances", "pallet-bridge-messages", "pallet-im-online", "pallet-message-queue", @@ -6393,8 +6491,6 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-service", "rococo-runtime", @@ -6405,7 +6501,6 @@ dependencies = [ "sp-consensus-beefy", "sp-core", "sp-runtime", - "staging-kusama-runtime", "staging-xcm", "westend-runtime", "westend-runtime-constants", @@ -6723,6 +6818,12 @@ dependencies = [ ] [[package]] +name = "keystream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" + +[[package]] name = "kitchensink-runtime" version = "3.0.0-dev" dependencies = [ @@ -6770,6 +6871,7 @@ dependencies = [ "pallet-lottery", "pallet-membership", "pallet-message-queue", + "pallet-mixnet", "pallet-mmr", "pallet-multisig", "pallet-nft-fractionalization", @@ -6823,6 +6925,7 @@ dependencies = [ "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-mixnet", "sp-offchain", "sp-runtime", "sp-session", @@ -6837,19 +6940,6 @@ dependencies = [ ] [[package]] -name = "kusama-runtime-constants" -version = "1.0.0" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", -] - -[[package]] name = "kvdb" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6893,9 +6983,9 @@ dependencies = [ [[package]] name = "landlock" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +checksum = "1530c5b973eeed4ac216af7e24baf5737645a6272e361f1fb95710678b67d9cc" dependencies = [ "enumflags2", "libc", @@ -7438,7 +7528,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -7522,6 +7612,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] +name = "lioness" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9" +dependencies = [ + "arrayref", + "blake2 0.8.1", + "chacha", + "keystream", +] + +[[package]] name = "lite-json" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7623,50 +7725,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "macro_magic_core" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "macro_magic_core_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "macro_magic_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -7852,6 +7954,31 @@ dependencies = [ ] [[package]] +name = "mixnet" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "bitflags 1.3.2", + "blake2 0.10.6", + "c2-chacha", + "curve25519-dalek 4.0.0", + "either", + "hashlink", + "lioness", + "log", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_distr", + "subtle 2.4.1", + "thiserror", + "zeroize", +] + +[[package]] name = "mmr-gadget" version = "4.0.0-dev" dependencies = [ @@ -8152,8 +8279,8 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" name = "node-bench" version = "0.9.0-dev" dependencies = [ - "array-bytes", - "clap 4.4.4", + "array-bytes 6.1.0", + "clap 4.4.6", "derive_more", "fs_extra", "futures", @@ -8188,9 +8315,9 @@ dependencies = [ name = "node-cli" version = "3.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_cmd", - "clap 4.4.4", + "clap 4.4.6", "clap_complete", "criterion 0.4.0", "frame-benchmarking-cli", @@ -8229,6 +8356,7 @@ dependencies = [ "sc-consensus-slots", "sc-executor", "sc-keystore", + "sc-mixnet", "sc-network", "sc-network-common", "sc-network-statement", @@ -8258,6 +8386,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-keystore", + "sp-mixnet", "sp-runtime", "sp-statement-store", "sp-timestamp", @@ -8316,7 +8445,7 @@ dependencies = [ name = "node-inspect" version = "0.9.0-dev" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -8349,6 +8478,7 @@ dependencies = [ "sc-consensus-babe-rpc", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", + "sc-mixnet", "sc-rpc", "sc-rpc-api", "sc-rpc-spec-v2", @@ -8370,7 +8500,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "generate-bags", "kitchensink-runtime", ] @@ -8379,7 +8509,7 @@ dependencies = [ name = "node-template" version = "4.0.0-dev" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -8422,7 +8552,7 @@ dependencies = [ name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "flate2", "fs_extra", "glob", @@ -8795,7 +8925,7 @@ dependencies = [ name = "pallet-alliance" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "frame-benchmarking", "frame-support", "frame-system", @@ -9098,7 +9228,7 @@ dependencies = [ name = "pallet-beefy-mmr" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "binary-merkle-tree", "frame-support", "frame-system", @@ -9321,7 +9451,7 @@ dependencies = [ name = "pallet-contracts" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", "env_logger 0.9.3", @@ -9374,7 +9504,7 @@ version = "4.0.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -9655,7 +9785,7 @@ dependencies = [ name = "pallet-glutton" version = "4.0.0-dev" dependencies = [ - "blake2", + "blake2 0.10.6", "frame-benchmarking", "frame-support", "frame-system", @@ -9824,10 +9954,29 @@ dependencies = [ ] [[package]] +name = "pallet-mixnet" +version = "0.1.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-application-crypto", + "sp-arithmetic", + "sp-io", + "sp-mixnet", + "sp-runtime", + "sp-std", +] + +[[package]] name = "pallet-mmr" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "env_logger 0.9.3", "frame-benchmarking", "frame-support", @@ -10445,7 +10594,7 @@ dependencies = [ "proc-macro2", "quote", "sp-runtime", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -10625,7 +10774,7 @@ dependencies = [ name = "pallet-transaction-storage" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "frame-benchmarking", "frame-support", "frame-system", @@ -10646,6 +10795,7 @@ dependencies = [ name = "pallet-treasury" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10835,7 +10985,7 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -10952,7 +11102,6 @@ dependencies = [ "cumulus-primitives-utility", "frame-support", "frame-system", - "kusama-runtime-constants", "log", "num-traits", "pallet-asset-tx-payment", @@ -10960,10 +11109,10 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "parachain-info", "parity-scale-codec", "polkadot-core-primitives", "polkadot-primitives", - "polkadot-runtime-constants", "rococo-runtime-constants", "scale-info", "smallvec", @@ -10974,7 +11123,6 @@ dependencies = [ "sp-std", "staging-xcm", "staging-xcm-builder", - "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", ] @@ -11019,7 +11167,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" dependencies = [ - "blake2", + "blake2 0.10.6", "crc32fast", "fs2", "hex", @@ -11314,7 +11462,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11355,7 +11503,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11438,7 +11586,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "1.2.0" +version = "1.3.0" dependencies = [ "assert_cmd", "color-eyre", @@ -11574,12 +11722,12 @@ dependencies = [ name = "polkadot-cli" version = "1.1.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "frame-benchmarking-cli", "futures", "log", "polkadot-node-metrics", - "polkadot-performance-test", + "polkadot-node-primitives", "polkadot-service", "pyroscope", "pyroscope_pprofrs", @@ -12035,9 +12183,12 @@ version = "1.0.0" dependencies = [ "always-assert", "assert_matches", + "cfg-if", + "criterion 0.4.0", "futures", "futures-timer", "hex-literal", + "is_executable", "libc", "parity-scale-codec", "pin-project", @@ -12051,11 +12202,11 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", + "rococo-runtime", "slotmap", "sp-core", "sp-maybe-compressed-blob", "sp-wasm-interface", - "substrate-build-script-utils", "tempfile", "test-parachain-adder", "test-parachain-halt", @@ -12091,6 +12242,7 @@ name = "polkadot-node-core-pvf-common" version = "1.0.0" dependencies = [ "assert_matches", + "cfg-if", "cpu-time", "futures", "landlock", @@ -12132,6 +12284,7 @@ dependencies = [ name = "polkadot-node-core-pvf-prepare-worker" version = "1.0.0" dependencies = [ + "cfg-if", "futures", "libc", "parity-scale-codec", @@ -12375,7 +12528,6 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "sc-client-api", - "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -12389,12 +12541,13 @@ dependencies = [ "assert_cmd", "asset-hub-kusama-runtime", "asset-hub-polkadot-runtime", + "asset-hub-rococo-runtime", "asset-hub-westend-runtime", "async-trait", "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", - "clap 4.4.4", + "clap 4.4.6", "collectives-polkadot-runtime", "color-print", "contracts-rococo-runtime", @@ -12405,6 +12558,7 @@ dependencies = [ "cumulus-client-consensus-proposer", "cumulus-client-consensus-relay-chain", "cumulus-client-service", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", @@ -12482,23 +12636,6 @@ dependencies = [ ] [[package]] -name = "polkadot-performance-test" -version = "1.0.0" -dependencies = [ - "env_logger 0.9.3", - "log", - "polkadot-erasure-coding", - "polkadot-node-core-pvf-prepare-worker", - "polkadot-node-primitives", - "polkadot-primitives", - "quote", - "sc-executor-common", - "sp-maybe-compressed-blob", - "staging-kusama-runtime", - "thiserror", -] - -[[package]] name = "polkadot-primitives" version = "1.0.0" dependencies = [ @@ -12567,111 +12704,6 @@ dependencies = [ ] [[package]] -name = "polkadot-runtime" -version = "1.0.0" -dependencies = [ - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-remote-externalities", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-staking-runtime-api", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "separator", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-transaction-pool", - "sp-trie", - "sp-version", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "static_assertions", - "substrate-wasm-builder", - "tiny-keccak", - "tokio", -] - -[[package]] name = "polkadot-runtime-common" version = "1.0.0" dependencies = [ @@ -12685,6 +12717,7 @@ dependencies = [ "impl-trait-for-tuples", "libsecp256k1", "log", + "pallet-asset-rate", "pallet-authorship", "pallet-babe", "pallet-balances", @@ -12697,6 +12730,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-primitives-test-helpers", @@ -12719,23 +12753,12 @@ dependencies = [ "sp-staking", "sp-std", "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", ] [[package]] -name = "polkadot-runtime-constants" -version = "1.0.0" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", -] - -[[package]] name = "polkadot-runtime-metrics" version = "1.0.0" dependencies = [ @@ -13005,7 +13028,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.4.4", + "clap 4.4.6", "color-eyre", "futures", "futures-timer", @@ -13152,11 +13175,9 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "generate-bags", - "polkadot-runtime", "sp-io", - "staging-kusama-runtime", "westend-runtime", ] @@ -13332,7 +13353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13408,20 +13429,20 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro-warning" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" dependencies = [ "unicode-ident", ] @@ -13460,7 +13481,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13618,9 +13639,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", @@ -13851,7 +13872,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13914,16 +13935,12 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "frame-system", - "kusama-runtime-constants", "log", "pallet-bags-list-remote-tests", - "polkadot-runtime", - "polkadot-runtime-constants", "sp-core", "sp-tracing", - "staging-kusama-runtime", "tokio", "westend-runtime", "westend-runtime-constants", @@ -13996,20 +14013,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle", + "subtle 2.4.1", ] [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" +source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", - "blake2", + "blake2 0.10.6", "common", "fflonk", "merlin 3.0.0", @@ -14085,6 +14102,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-common", "scale-info", "sp-api", "sp-block-builder", @@ -14119,6 +14137,7 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", + "pallet-asset-rate", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -14128,6 +14147,7 @@ dependencies = [ "pallet-bounties", "pallet-child-bounties", "pallet-collective", + "pallet-conviction-voting", "pallet-democracy", "pallet-elections-phragmen", "pallet-grandpa", @@ -14142,7 +14162,9 @@ dependencies = [ "pallet-offences", "pallet-preimage", "pallet-proxy", + "pallet-ranked-collective", "pallet-recovery", + "pallet-referenda", "pallet-scheduler", "pallet-session", "pallet-society", @@ -14156,6 +14178,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -14171,6 +14194,7 @@ dependencies = [ "serde_json", "smallvec", "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -14211,6 +14235,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", + "staging-xcm", ] [[package]] @@ -14616,16 +14641,16 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "sc-cli" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "chrono", - "clap 4.4.4", + "clap 4.4.6", "fdlimit", "futures", "futures-timer", @@ -14639,6 +14664,7 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-keystore", + "sc-mixnet", "sc-network", "sc-service", "sc-telemetry", @@ -14693,7 +14719,7 @@ dependencies = [ name = "sc-client-db" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "criterion 0.4.0", "hash-db", "kitchensink-runtime", @@ -14858,7 +14884,7 @@ dependencies = [ name = "sc-consensus-beefy" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-channel", "async-trait", "fnv", @@ -14934,7 +14960,7 @@ name = "sc-consensus-grandpa" version = "0.10.0-dev" dependencies = [ "ahash 0.8.3", - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "async-trait", "dyn-clone", @@ -15089,7 +15115,7 @@ dependencies = [ name = "sc-executor" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "criterion 0.4.0", "env_logger 0.9.3", @@ -15144,6 +15170,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", + "parking_lot 0.12.1", "paste", "rustix 0.36.15", "sc-allocator", @@ -15176,7 +15203,7 @@ dependencies = [ name = "sc-keystore" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -15187,10 +15214,37 @@ dependencies = [ ] [[package]] +name = "sc-mixnet" +version = "0.1.0-dev" +dependencies = [ + "array-bytes 4.2.0", + "arrayvec 0.7.4", + "blake2 0.10.6", + "futures", + "futures-timer", + "libp2p-identity", + "log", + "mixnet", + "multiaddr", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-client-api", + "sc-network", + "sc-transaction-pool-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-keystore", + "sp-mixnet", + "sp-runtime", + "thiserror", +] + +[[package]] name = "sc-network" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "async-channel", "async-trait", @@ -15305,7 +15359,7 @@ dependencies = [ name = "sc-network-light" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-channel", "futures", "libp2p-identity", @@ -15325,7 +15379,7 @@ dependencies = [ name = "sc-network-statement" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-channel", "futures", "libp2p", @@ -15342,7 +15396,7 @@ dependencies = [ name = "sc-network-sync" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-channel", "async-trait", "fork-tree", @@ -15375,6 +15429,7 @@ dependencies = [ "substrate-test-runtime-client", "thiserror", "tokio", + "tokio-stream", ] [[package]] @@ -15411,7 +15466,7 @@ dependencies = [ name = "sc-network-transactions" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "futures", "libp2p", "log", @@ -15428,7 +15483,7 @@ dependencies = [ name = "sc-offchain" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "bytes", "fnv", "futures", @@ -15488,6 +15543,7 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-mixnet", "sc-network", "sc-network-common", "sc-rpc-api", @@ -15519,6 +15575,7 @@ dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-chain-spec", + "sc-mixnet", "sc-transaction-pool-api", "scale-info", "serde", @@ -15548,7 +15605,7 @@ dependencies = [ name = "sc-rpc-spec-v2" version = "0.10.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "futures", "futures-util", @@ -15661,7 +15718,7 @@ dependencies = [ name = "sc-service-test" version = "2.0.0" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-channel", "fdlimit", "futures", @@ -15727,7 +15784,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.1.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "fs4", "log", "sc-client-db", @@ -15827,14 +15884,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "async-trait", "criterion 0.4.0", @@ -15896,9 +15953,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ "bitvec", "cfg-if", @@ -15910,9 +15967,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -15954,7 +16011,7 @@ dependencies = [ "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -16028,7 +16085,7 @@ dependencies = [ "der 0.6.1", "generic-array 0.14.7", "pkcs8 0.9.0", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -16042,7 +16099,7 @@ dependencies = [ "der 0.7.8", "generic-array 0.14.7", "pkcs8 0.10.2", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -16187,7 +16244,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -16253,7 +16310,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -16607,14 +16664,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ "aes-gcm 0.9.4", - "blake2", + "blake2 0.10.6", "chacha20poly1305", "curve25519-dalek 4.0.0", "rand_core 0.6.4", "ring 0.16.20", "rustc_version 0.4.0", "sha2 0.10.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -16681,12 +16738,12 @@ version = "4.0.0-dev" dependencies = [ "Inflector", "assert_matches", - "blake2", + "blake2 0.10.6", "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -16764,100 +16821,6 @@ dependencies = [ ] [[package]] -name = "sp-ark-bls12-377" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b60ba7d8fbb82e21f5be499b02438c9a79365acb441a4dc3993179f09c4cc9" -dependencies = [ - "ark-bls12-377", - "ark-ff", - "ark-r1cs-std", - "ark-scale", - "ark-std", - "parity-scale-codec", - "sp-ark-models", -] - -[[package]] -name = "sp-ark-bls12-381" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cd101171d2e988a4e1b2320ad3f26f8746a263110c7153213fe86293e0552b" -dependencies = [ - "ark-bls12-381", - "ark-ff", - "ark-scale", - "ark-serialize", - "ark-std", - "parity-scale-codec", - "sp-ark-models", -] - -[[package]] -name = "sp-ark-bw6-761" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94d66ba98893cc42dfe81d5b5dee9142577176bdbdba80ec25a37d8cdffdbd5" -dependencies = [ - "ark-bw6-761", - "ark-ff", - "ark-scale", - "ark-std", - "parity-scale-codec", - "sp-ark-models", -] - -[[package]] -name = "sp-ark-ed-on-bls12-377" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f6ea96c9b1cd4cbd05d741225ff7f6328ab035bda16cf3fac105c87ad98959" -dependencies = [ - "ark-ed-on-bls12-377", - "ark-ff", - "ark-r1cs-std", - "ark-scale", - "ark-serialize", - "ark-std", - "parity-scale-codec", - "sp-ark-models", -] - -[[package]] -name = "sp-ark-ed-on-bls12-381-bandersnatch" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db7a801260397cd58077befcee87acfdde8c189f48718bba1bc3783c799b67b" -dependencies = [ - "ark-ec", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ff", - "ark-r1cs-std", - "ark-scale", - "ark-std", - "parity-scale-codec", - "sp-ark-bls12-381", - "sp-ark-models", -] - -[[package]] -name = "sp-ark-models" -version = "0.4.1-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd77599e09f12893739e1ef822ae065f2f46c3be040ba1979bb786ae21059f44" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "getrandom 0.2.10", - "itertools 0.10.5", - "num-traits", - "zeroize", -] - -[[package]] name = "sp-authority-discovery" version = "4.0.0-dev" dependencies = [ @@ -16949,7 +16912,7 @@ dependencies = [ name = "sp-consensus-beefy" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "lazy_static", "parity-scale-codec", "scale-info", @@ -17023,10 +16986,10 @@ dependencies = [ name = "sp-core" version = "21.0.0" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "bandersnatch_vrfs", "bitflags 1.3.2", - "blake2", + "blake2 0.10.6", "bounded-collections", "bs58 0.5.0", "criterion 0.4.0", @@ -17086,32 +17049,20 @@ version = "9.0.0" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "sp-crypto-ec-utils" version = "0.4.0" dependencies = [ - "ark-algebra-test-templates", "ark-bls12-377", "ark-bls12-381", "ark-bw6-761", "ark-ec", "ark-ed-on-bls12-377", "ark-ed-on-bls12-381-bandersnatch", - "ark-ff", "ark-scale", - "ark-serialize", - "ark-std", - "parity-scale-codec", - "sp-ark-bls12-377", - "sp-ark-bls12-381", - "sp-ark-bw6-761", - "sp-ark-ed-on-bls12-377", - "sp-ark-ed-on-bls12-381-bandersnatch", - "sp-ark-models", - "sp-io", "sp-runtime-interface", "sp-std", ] @@ -17130,7 +17081,7 @@ version = "8.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -17232,10 +17183,21 @@ dependencies = [ ] [[package]] +name = "sp-mixnet" +version = "0.1.0-dev" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-std", +] + +[[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "ckb-merkle-mountain-range", "log", "parity-scale-codec", @@ -17268,7 +17230,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "honggfuzz", "rand 0.8.5", "sp-npos-elections", @@ -17361,7 +17323,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -17433,7 +17395,7 @@ dependencies = [ name = "sp-state-machine" version = "0.28.0" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "assert_matches", "hash-db", "log", @@ -17555,7 +17517,7 @@ name = "sp-trie" version = "22.0.0" dependencies = [ "ahash 0.8.3", - "array-bytes", + "array-bytes 6.1.0", "criterion 0.4.0", "hash-db", "hashbrown 0.13.2", @@ -17564,6 +17526,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", @@ -17601,7 +17564,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -17695,120 +17658,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "staging-kusama-runtime" -version = "1.0.0" -dependencies = [ - "binary-merkle-tree", - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-remote-externalities", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-mmr", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "separator", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-transaction-pool", - "sp-trie", - "sp-version", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "static_assertions", - "substrate-wasm-builder", - "tiny-keccak", - "tokio", -] - -[[package]] name = "staging-xcm" version = "1.0.0" dependencies = [ @@ -17975,7 +17824,7 @@ dependencies = [ "md-5", "rand 0.8.5", "ring 0.16.20", - "subtle", + "subtle 2.4.1", "thiserror", "tokio", "url", @@ -17986,11 +17835,30 @@ dependencies = [ name = "subkey" version = "3.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "sc-cli", ] [[package]] +name = "substrate" +version = "1.0.0" +dependencies = [ + "aquamarine", + "chain-spec-builder", + "frame-support", + "sc-cli", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-beefy", + "sc-consensus-grandpa", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-service", + "sp-runtime", + "subkey", +] + +[[package]] name = "substrate-bip39" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18028,7 +17896,7 @@ dependencies = [ name = "substrate-frame-cli" version = "4.0.0-dev" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "frame-support", "frame-system", "sc-cli", @@ -18122,7 +17990,7 @@ dependencies = [ name = "substrate-test-client" version = "2.0.1" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "async-trait", "futures", "parity-scale-codec", @@ -18147,7 +18015,7 @@ dependencies = [ name = "substrate-test-runtime" version = "2.0.0" dependencies = [ - "array-bytes", + "array-bytes 6.1.0", "frame-executive", "frame-support", "frame-system", @@ -18263,6 +18131,12 @@ dependencies = [ [[package]] name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" @@ -18377,9 +18251,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", @@ -18487,7 +18361,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "futures", "futures-timer", "log", @@ -18535,7 +18409,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.4.4", + "clap 4.4.6", "futures", "futures-timer", "log", @@ -18624,7 +18498,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -18804,7 +18678,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -18985,7 +18859,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -19028,7 +18902,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -19181,7 +19055,7 @@ version = "0.10.0-dev" dependencies = [ "assert_cmd", "async-trait", - "clap 4.4.4", + "clap 4.4.6", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -19352,7 +19226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -19362,7 +19236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -19577,7 +19451,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -19611,7 +19485,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -19651,9 +19525,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" +checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52" dependencies = [ "anyhow", "libc", @@ -19667,9 +19541,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" +checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e" dependencies = [ "anyhow", "cxx", @@ -19679,9 +19553,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" +checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe" dependencies = [ "anyhow", "cc", @@ -20111,7 +19985,7 @@ dependencies = [ "sha1", "sha2 0.10.7", "signature 1.6.4", - "subtle", + "subtle 2.4.1", "thiserror", "tokio", "webpki 0.21.4", @@ -20205,7 +20079,7 @@ dependencies = [ "rtcp", "rtp", "sha-1 0.9.8", - "subtle", + "subtle 2.4.1", "thiserror", "tokio", "webrtc-util", @@ -20249,6 +20123,7 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", + "pallet-asset-rate", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -20257,6 +20132,7 @@ dependencies = [ "pallet-beefy", "pallet-beefy-mmr", "pallet-collective", + "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -20278,6 +20154,7 @@ dependencies = [ "pallet-preimage", "pallet-proxy", "pallet-recovery", + "pallet-referenda", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", @@ -20293,6 +20170,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -20308,6 +20186,7 @@ dependencies = [ "smallvec", "sp-api", "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -20348,6 +20227,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", + "staging-xcm", ] [[package]] @@ -20748,7 +20628,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -20867,7 +20747,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 5947a3112e9be..f391ccac79044 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-Xgu1BlSGDAj79TKSM9vCbzBT4quOMBd6evImkkKycH4="; + hash = "sha256-7hCQdJHzuPQTNZFDGEZG/Q6G/Gh/gJANV5uiL/d6Pas="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-Tcrz2tT561ICAJzMgarSTOnaUEPeTFKZzE7rkdL3eUQ="; - "common-0.1.0" = "sha256-dnZKDx3Rw5cd4ejcilo3Opsn/1XK9yWGxhceuwvBE0o="; + "ark-secret-scalar-0.0.2" = "sha256-GROzlo+1QQ8wd090/esQRmaV8KWjNEfUlFlldnME28A="; + "common-0.1.0" = "sha256-ru++KG2ZZqa/wDGnKF/VfWnazHRSpOAD0WYb7rHlpCU="; "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; }; }; @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3Only; - maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ]; + maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/cosmic-edit/Cargo.lock b/pkgs/applications/editors/cosmic-edit/Cargo.lock new file mode 100644 index 0000000000000..7a0af40f0bc54 --- /dev/null +++ b/pkgs/applications/editors/cosmic-edit/Cargo.lock @@ -0,0 +1,5610 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +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.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.7.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "accesskit_windows" +version = "0.14.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec", + "once_cell", + "paste", + "windows", +] + +[[package]] +name = "accesskit_winit" +version = "0.13.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "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.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +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 = "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 = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "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 2.5.3", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "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 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.1", + "futures-lite", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[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.38", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.1.0", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.21", + "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 = "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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 = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[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.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "libc", + "system-deps", +] + +[[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 = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +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 = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" +dependencies = [ + "thiserror", + "x11rb 0.9.0", +] + +[[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-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-edit" +version = "0.1.0" +dependencies = [ + "cosmic-text 0.10.0", + "env_logger", + "fontdb 0.15.0", + "i18n-embed", + "i18n-embed-fl", + "lazy_static", + "libcosmic", + "log", + "rfd", + "rust-embed", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb 0.14.1", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-text" +version = "0.10.0" +source = "git+https://github.com/pop-os/cosmic-text?branch=vi-editor#e62fea5efddb20fd1bc518e0d733a86f6858fa73" +dependencies = [ + "fontdb 0.15.0", + "libm", + "log", + "rangemap", + "rustc-hash", + "rustybuzz 0.11.0", + "self_cell 1.0.1", + "swash", + "syntect", + "sys-locale", + "two-face", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +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.38", +] + +[[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.38", +] + +[[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.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[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_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.38", +] + +[[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 = "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.38", +] + +[[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 = "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.38", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[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 = "event-listener" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[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 0.10.2", + "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.2", +] + +[[package]] +name = "fontdb" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.8.0", + "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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[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", + "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 = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[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 0.9.0", + "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", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[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.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[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.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "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 = "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 = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[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.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.38", + "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.38", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "iced_winit", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "accesskit", + "accesskit_winit", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "iced_core", + "iced_futures", + "thiserror", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "bytemuck", + "cosmic-text 0.9.0", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "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?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "iced_winit" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +dependencies = [ + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "raw-window-handle", + "thiserror", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[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", + "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 = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +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.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +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.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic?branch=menu#ef6c21b647480e8bfea80e3dc628079de90f51c3" +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", + "iced_winit", + "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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[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 = "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.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.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 = "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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +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 = "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.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[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 = "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.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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.38", +] + +[[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 = "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 = "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-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.38", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[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.38", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.9", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[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.38", +] + +[[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.38", +] + +[[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 = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plist" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +dependencies = [ + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml 0.30.0", + "serde", + "time", +] + +[[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 = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[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_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[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" + +[[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 0.10.0", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c9e7b57df6e8472152674607f6cc68aa14a748a3157a857a94f516e11aeacc2" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +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.1", + "serde", + "serde_derive", +] + +[[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 = "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.38", + "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.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "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 = "rustybuzz" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "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 = "sctk-adwaita" +version = "0.5.4" +source = "git+https://github.com/pop-os/sctk-adwaita?branch=wayland-resize#da85380dfb8f0c13aed51c5bddaad0ba3654cb1f" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.5.10", + "smithay-client-toolkit", + "tiny-skia 0.8.4", +] + +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "self_cell" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[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 = "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.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-client-toolkit" +version = "0.16.1" +source = "git+https://github.com/pop-os/client-toolkit?branch=wayland-resize#515820fc86cf8cb3ac8d087dc6c87852767627ca" +dependencies = [ + "bitflags 1.3.2", + "calloop", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor", + "wayland-protocols", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit", + "wayland-client 0.29.5", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[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", + "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 = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[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 = "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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syntect" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "flate2", + "fnv", + "once_cell", + "onig", + "plist", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "thiserror", + "walkdir", + "yaml-rust", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.6", + "version-compare", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "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.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 = "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.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +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.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[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 = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "two-face" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" +dependencies = [ + "once_cell", + "serde", + "syntect", +] + +[[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 = "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.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-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + +[[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.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 0.14.1", + "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 0.10.0", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[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.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[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.4", + "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", + "nix 0.26.4", + "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-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-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-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-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.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +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.1", + "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.1", + "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.1", + "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 = "window_clipboard" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-implement" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.6" +source = "git+https://github.com/pop-os/winit.git?branch=master#c6ad672264b2e320cd15a531f67e133d9ecd39bf" +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", + "sctk-adwaita", + "smithay-client-toolkit", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-protocols", + "wayland-scanner 0.29.5", + "web-sys", + "windows-sys 0.45.0", + "x11-dl", +] + +[[package]] +name = "winnow" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" +dependencies = [ + "gethostname", + "nix 0.22.3", + "winapi", + "winapi-wsapoll", +] + +[[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.4", + "winapi", +] + +[[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 = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[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 1.13.0", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50cbb27c30666a6108abd6bc7577556265b44f243e2be89a8bc4e07a528c107" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25f293fe55f0a48e7010d65552bb63704f6ceb55a1a385da10d41d8f78e4a3d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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/editors/cosmic-edit/default.nix b/pkgs/applications/editors/cosmic-edit/default.nix new file mode 100644 index 0000000000000..9b53bb5ef9263 --- /dev/null +++ b/pkgs/applications/editors/cosmic-edit/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, cmake +, makeWrapper +, cosmic-icons +, just +, pkg-config +, libxkbcommon +, glib +, gtk3 +, libinput +, fontconfig +, freetype +, wayland +, expat +, udev +, which +, lld +, util-linuxMinimal +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-edit"; + version = "unstable-2023-11-02"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-edit"; + rev = "ee2dea71e6e21967bc705046f9650407d07cdada"; + sha256 = "sha256-27j9Imlyzwy2yjpNsWWcX0qW38ZxMDkht1Eaggr4NYY="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; + "cosmic-config-0.1.0" = "sha256-VKvJ7cNwMLLs6ElpgP6xwsBUnD5MDApwWl7rrb/Lr/U="; + "cosmic-text-0.10.0" = "sha256-g9y2qZ2ivpDtZAtsXqMXgGjUFi9QZx/weMhk7hmnB3E="; + "sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ="; + "smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; + "winit-0.28.6" = "sha256-FhW6d2XnXCGJUMoT9EMQew9/OPXiehy/JraeCiVd76M="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; + buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev glib gtk3 ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-edit" + ]; + + postInstall = '' + wrapProgram "$out/bin/${pname}" \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-edit"; + description = "Text Editor for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ahoneybun ]; + platforms = platforms.linux; + }; +} 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 eba4586a107ab..ffd8253ae2c4d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -297,10 +297,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.7.0.20230802.104021"; + version = "1.9.7.0.20231105.171300"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.7.0.20230802.104021.tar"; - sha256 = "1w300q3fgnpibsbgkmxpicxv5ba8xj7cv9i28j7854b49d6xvjb6"; + url = "https://elpa.gnu.org/devel/async-1.9.7.0.20231105.171300.tar"; + sha256 = "1f3z679jlhv8xyc1kssmcgq9alwa06r64cpclf477fs6581nda2w"; }; packageRequires = [ emacs ]; meta = { @@ -582,10 +582,10 @@ elpaBuild { pname = "breadcrumb"; ename = "breadcrumb"; - version = "1.0.1.0.20230913.180643"; + version = "1.0.1.0.20231107.53204"; src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20230913.180643.tar"; - sha256 = "1f2kgjmdn8m9sgwx42yv7ldn41s0az53kn6vzlshx5h77y2g1bsn"; + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231107.53204.tar"; + sha256 = "0ai8vw9mnlbsc6qmvapdw8mnkssxj1g3hg83acjc4vlcrdxr40vg"; }; packageRequires = [ emacs project ]; meta = { @@ -620,10 +620,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.5.0.20231008.102838"; + version = "0.5.0.20231028.161716"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231008.102838.tar"; - sha256 = "0isxis03qgiq73zrizsv4xmmbdzqpcwh4kiva4kfiggz43xsk2g7"; + url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231028.161716.tar"; + sha256 = "1gi7092mfzsqfj8l000arxdwmg73xzbgzfliazzk0s617480ccbw"; }; packageRequires = [ compat emacs ]; meta = { @@ -650,6 +650,21 @@ license = lib.licenses.free; }; }) {}; + bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bufferlo"; + ename = "bufferlo"; + version = "0.2.0.20231106.215852"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bufferlo-0.2.0.20231106.215852.tar"; + sha256 = "17qjjifdl3y8p4ldzami9b3ns9mzzqdacvkzsryv5885hzas67zz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bufferlo.html"; + license = lib.licenses.free; + }; + }) {}; bug-hunter = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -710,10 +725,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.17.0.20231022.115714"; + version = "0.17.0.20231029.100801"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.17.0.20231022.115714.tar"; - sha256 = "0bvmrxjd054f14qap6w5052900k4pn33vb7cbc87rvrgdyhh5ixa"; + url = "https://elpa.gnu.org/devel/cape-0.17.0.20231029.100801.tar"; + sha256 = "14898pkxh61sxhmapb87zafl5wjz5w2na0mqpj8c36hvr5h33jnj"; }; packageRequires = [ compat emacs ]; meta = { @@ -905,17 +920,14 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231023.103313"; + version = "0.10.2.0.20231110.5234"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231023.103313.tar"; - sha256 = "1zcap5mv6cn9a2j8axg4yw4iprxkwwyjmw7qahijlk02ycwmwwfn"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231110.5234.tar"; + sha256 = "18533dlk7k77if51kjhwlf2yb872ixjf1cffg197bnfy29sdrm11"; }; packageRequires = [ emacs ]; meta = { @@ -988,10 +1000,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.2.0.20230927.210420"; + version = "29.1.4.3.0.20231107.184238"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230927.210420.tar"; - sha256 = "16apiq2aj82gmlg1xaqrrv6riikdb2m4iyg3b4abp472q8hwwfk5"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.3.0.20231107.184238.tar"; + sha256 = "1mcfx5my48zr14syzmpidgr1kjji2v63sqmx3zh7spxxd274yviq"; }; packageRequires = [ emacs seq ]; meta = { @@ -1003,10 +1015,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231023.154305"; + version = "0.35.0.20231107.212252"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231023.154305.tar"; - sha256 = "1cx8m0llk76z1kawkqg9dq7aws2i2bsgnhr3xvw7chdwvjywghs6"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231107.212252.tar"; + sha256 = "1p9l79sxxa06cxky5z08mccf34hbbp742iza57riknf0zmrglkpc"; }; packageRequires = [ compat emacs ]; meta = { @@ -1055,10 +1067,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20231013.185720"; + version = "0.38.0.20231108.174629"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231013.185720.tar"; - sha256 = "0573w5zgkchk5kkj2wb7sl1qrp88k99v44jv0cddrrn35r77hrpx"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231108.174629.tar"; + sha256 = "1ynkyw7mkl8y66kxwy51gwdj60b4nadk9qbwsjljbfdnc80y6ws5"; }; packageRequires = [ compat emacs ]; meta = { @@ -1290,10 +1302,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.37.0.20231020.114541"; + version = "0.37.0.20231029.152335"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231020.114541.tar"; - sha256 = "1bzphx74h67jyfdz66p6d78knqddfgvzwk8w848r1lfw2jh2h6dc"; + url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231029.152335.tar"; + sha256 = "0i2jbns27cfrlkyq3rszqkg6vqbw9r2pq2w9yxcyj60v0hq0ww53"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1320,10 +1332,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20231027.53913"; + version = "2.0.0.0.20231107.64253"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231027.53913.tar"; - sha256 = "044r77y0b7b3svwjin926xkp8xcwkxjpixi0x8nrfzh2krzkkakx"; + url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231107.64253.tar"; + sha256 = "143pgnsfi3mf42n1yrwjr79b32k0081i19zdkwg97xhvfbqhiddw"; }; packageRequires = [ emacs ]; meta = { @@ -1472,6 +1484,24 @@ license = lib.licenses.free; }; }) {}; + dired-duplicates = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "dired-duplicates"; + ename = "dired-duplicates"; + version = "0.2.0.20231109.135341"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-duplicates-0.2.0.20231109.135341.tar"; + sha256 = "07ridbcy3n0v3dax7kj3d7nk2k0w57dnapd4kki4xhkm4fklx6w6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-duplicates.html"; + license = lib.licenses.free; + }; + }) {}; dired-git-info = callPackage ({ elpaBuild , emacs , fetchurl @@ -1727,10 +1757,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20230127.0.20230521.54745"; + version = "20230127.0.20231106.221153"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20230127.0.20230521.54745.tar"; - sha256 = "09s6r6xjyfhdiy7j3wnw53gyjbjr8347ikzhi6xxzkna3r5fc1mx"; + url = "https://elpa.gnu.org/devel/eev-20230127.0.20231106.221153.tar"; + sha256 = "0labf7shjyv5v5rakkgra8338k9y5ads82ziqracklgj5p39gakf"; }; packageRequires = [ emacs ]; meta = { @@ -1745,10 +1775,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.4.0.0.20231026.80318"; + version = "1.4.0.0.20231031.71401"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231026.80318.tar"; - sha256 = "02nx6p5m54gyyw2rjb0msvh3cijnqpm0p5i9l71gykg54rbabwnr"; + url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231031.71401.tar"; + sha256 = "02yrb6cv0l6k30xyd8wz0jjr4cy66p9limcrmkm52q1k7l0dq3za"; }; packageRequires = [ emacs ]; meta = { @@ -1770,10 +1800,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20231021.100531"; + version = "1.15.0.20231107.90944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231021.100531.tar"; - sha256 = "0rgf0s76sbmabmv1wvghs2qapl3g23j58ka4ks9dd95nc004b8i6"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231107.90944.tar"; + sha256 = "135a3zyzjpv2n0c988b9g9mh93y7p1dp9nvmchm4i26mdmzn6jbz"; }; packageRequires = [ eldoc @@ -1881,10 +1911,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231026.124244"; + version = "0.23.0.20231104.193345"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231026.124244.tar"; - sha256 = "0d73fpxqv243pbj36299nfb4j6w2aqabpn4l3z1gvcpx2x2abbrd"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231104.193345.tar"; + sha256 = "10qny8wp74np12sczz08gfrxspvapwvz2zkdig76wcrpd4kdpjk4"; }; packageRequires = [ compat emacs ]; meta = { @@ -1901,10 +1931,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231026.124244"; + version = "0.8.0.20231104.193345"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231026.124244.tar"; - sha256 = "0wd3pdkh0y5x2bd8q6q7bc543s5ks7d8zlxrflk5ywlqaz8xi9g4"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231104.193345.tar"; + sha256 = "15syrabv26yq69g2lz2dqs8w4drw1v3whr0h2vzmc1p0pv9jpks2"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1926,10 +1956,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14pre0.20231007.60132"; + version = "0.14pre0.20231029.40923"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231007.60132.tar"; - sha256 = "0ndvlrmmwlpn08pf45vg8qa9z8xjg41i03bw9x7lknlj27lk77c7"; + url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231029.40923.tar"; + sha256 = "06r0s8dxlxr63a1zgdk0qxzd6x27r6mlymi6hxp8923yvwqddkdf"; }; packageRequires = [ emacs @@ -1955,10 +1985,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20231017.153742"; + version = "16.0.20231106.173540"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20231017.153742.tar"; - sha256 = "02lvppyraqc66hb4q4smlcpccq3ggvhg6qj3ld66vmjl7gfasw1a"; + url = "https://elpa.gnu.org/devel/emms-16.0.20231106.173540.tar"; + sha256 = "08l7nzz596jwqr4wcjcvsihdhai4faqihavrshvja2nhrdxxm79x"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2024,10 +2054,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231027.130929"; + version = "5.6snapshot0.20231104.154155"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231027.130929.tar"; - sha256 = "1v1r86cpl4jnnds9ljwr71g3xc96b2gvjbcpcvkhjfbf8g58ky40"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231104.154155.tar"; + sha256 = "0z22cw6hgn4lsc1bp4ci75v03mvlra1nyfj8g7xkfdv75nbv2yga"; }; packageRequires = [ compat emacs ]; meta = { @@ -2277,6 +2307,25 @@ license = lib.licenses.free; }; }) {}; + flymake-codespell = callPackage ({ compat + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "flymake-codespell"; + ename = "flymake-codespell"; + version = "0.1.0.20231030.222337"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar"; + sha256 = "1i4gk9z9yfs9gb9x64n8wzxqy8lb81j422173xxg1lwsirc9a040"; + }; + packageRequires = [ compat emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-codespell.html"; + license = lib.licenses.free; + }; + }) {}; flymake-proselint = callPackage ({ elpaBuild , emacs , fetchurl @@ -2560,17 +2609,14 @@ license = lib.licenses.free; }; }) {}; - gpastel = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gpastel"; ename = "gpastel"; - version = "0.5.0.0.20181231.183754"; + version = "0.5.0.0.20231030.71342"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20181231.183754.tar"; - sha256 = "19byv5l09h8zdsgpifsc0j7np0iq1md4l0y7865g95xbax60i9id"; + url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar"; + sha256 = "1vd49mn7xgys0apc7z6s6cs3yygznlyyf4l1hhfrgg5vwfb3c7ry"; }; packageRequires = [ emacs ]; meta = { @@ -2637,10 +2683,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.5.0.0.20231026.5322"; + version = "0.6.0.0.20231104.45848"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20231026.5322.tar"; - sha256 = "0m4d1cr637jsy75ax6y2aqhzjwax7qkidm25k4qiqa69lzbkckid"; + url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231104.45848.tar"; + sha256 = "1ppvgi17agzrsjfd9jaa5zszvqcm1n4rfy7z82da4rl5mbgnml9p"; }; packageRequires = [ emacs ]; meta = { @@ -2738,10 +2784,10 @@ elpaBuild { pname = "hiddenquote"; ename = "hiddenquote"; - version = "1.2.0.20230911.171055"; + version = "1.2.0.20231107.184113"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20230911.171055.tar"; - sha256 = "00basln4s5ngxp353ldpzxp382chdxp05bafsazgxkh5mg94jsyf"; + url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar"; + sha256 = "0zgnxfcfd78c755rykmbnkvxx5lfpk7z3n8qky0lf3kj2hwas27v"; }; packageRequires = [ emacs ]; meta = { @@ -2823,10 +2869,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20231022.151646"; + version = "8.0.1pre0.20231106.194732"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231022.151646.tar"; - sha256 = "1kr6ayfnq9ah8n8b6k4lxh5napghb90y5sz0g3fs5qjbszcbvxc9"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231106.194732.tar"; + sha256 = "02d4r3w6angwjw2wr192gkgwyzfb3vszdsb18baziqbwq2xh5cch"; }; packageRequires = [ emacs ]; meta = { @@ -3067,10 +3113,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231026.154650"; + version = "0.9.0.20231104.142700"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231026.154650.tar"; - sha256 = "1fck948ay9n64mxqmx7j6fn6hzfn858l0s0gw544in2y617niyh6"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231104.142700.tar"; + sha256 = "16qq42qmklyls2fc482x2pv1l14x3kn78l41imvg8jrv3z64j89p"; }; packageRequires = [ compat emacs ]; meta = { @@ -3315,10 +3361,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.5.0.0.20231026.5843"; + version = "0.5.2.0.20231110.3036"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.5.0.0.20231026.5843.tar"; - sha256 = "0ywmfbis4jrqjg2gc3khgwc9kdbhjh99syag2bk1vzjmwfd2cq89"; + url = "https://elpa.gnu.org/devel/llm-0.5.2.0.20231110.3036.tar"; + sha256 = "0ai405k9lx0rmlawfmldphjpwrrpahyawhzzam0500jp6x02ppkg"; }; packageRequires = [ emacs ]; meta = { @@ -3476,10 +3522,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.3.0.20231026.181335"; + version = "1.3.0.20231028.90751"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231026.181335.tar"; - sha256 = "1q7dbzrdzjwiyq09zbq8wbj673vaj5ss3xyrz3y226wb6jpmzr74"; + url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231028.90751.tar"; + sha256 = "05k37f3qjvm6kv7y6fa6g5z02irpifvl1as4allrxgn12408ydvh"; }; packageRequires = [ compat emacs ]; meta = { @@ -3674,10 +3720,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20230926.152405"; + version = "4.3.0.0.20231031.71656"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20230926.152405.tar"; - sha256 = "04fncghgdsz0fb1f49dr64nvy4as9wrvlxnc7jlx1im1dgjv9lcq"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231031.71656.tar"; + sha256 = "04hjhg596qfkrnll0wrg4f50ilns28jpf2ws7021wivr370xajki"; }; packageRequires = [ emacs ]; meta = { @@ -4093,10 +4139,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20231025.204425"; + version = "1.0.0.20231107.210315"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231025.204425.tar"; - sha256 = "1lsfa62hpq6zmk49mnf1434lqv3p472la3aky003xplkvl0xbw7l"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231107.210315.tar"; + sha256 = "0j5fkmw4qy40ab2c6d0mf6637s8q95gi3sp7w477d6ymck5i2ck8"; }; packageRequires = [ emacs ]; meta = { @@ -4108,10 +4154,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231027.91944"; + version = "9.7pre0.20231108.95550"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231027.91944.tar"; - sha256 = "0af65mm22bl6c38abqn39s5rz6i67pbcmhfq6n2hn0a8jgmmppwc"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231108.95550.tar"; + sha256 = "01dk4sq5wfiwj9g5bfriqqkfrgdfy3c7kixd7y4cf9k6pbjl4sfp"; }; packageRequires = [ emacs ]; meta = { @@ -4306,10 +4352,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.14.0.20231014.133720"; + version = "0.14.0.20231029.105928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-0.14.0.20231014.133720.tar"; - sha256 = "1zfjn4p30f5d6j3mwgc7asvb2p4jfl16svq98mx0q1n270bgs098"; + url = "https://elpa.gnu.org/devel/osm-0.14.0.20231029.105928.tar"; + sha256 = "0hd2yg7yqnpdiy0icxz6fa128arrf2zl1sknj20ig52ba7z0wk2w"; }; packageRequires = [ compat emacs ]; meta = { @@ -4529,6 +4575,21 @@ license = lib.licenses.free; }; }) {}; + plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: + elpaBuild { + pname = "plz-see"; + ename = "plz-see"; + version = "0.1.0.20231101.73512"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar"; + sha256 = "1nqlv1ww8ba2a40bg3riv5w1sgj8cmhx6bldyzcgs88cpjjkia79"; + }; + packageRequires = [ emacs plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-see.html"; + license = lib.licenses.free; + }; + }) {}; poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "poke"; @@ -4667,10 +4728,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20231020.190403"; + version = "0.10.0.0.20231108.75740"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231020.190403.tar"; - sha256 = "07ywa9rf3gy4jjh4xpyp9v6sk39jiqc1nifklrvckm1mp84hl0qq"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231108.75740.tar"; + sha256 = "02arwv35vcpspg2k8nasmaz2ggc32v7p3iq2q6z5sznmdanl1jm4"; }; packageRequires = [ emacs xref ]; meta = { @@ -4712,10 +4773,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20230929.115806"; + version = "1.0.1.0.20231101.62313"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20230929.115806.tar"; - sha256 = "1rs8jnvj4g5m675srf3civhk52csm4nf7df81xscgvh6pafgyfvj"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231101.62313.tar"; + sha256 = "10k57sd29hkbja85sn5yf7wm0g5wyk216ykdjl4vr03891ic03dg"; }; packageRequires = [ emacs ]; meta = { @@ -5269,10 +5330,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.3.2.0.20230826.202144"; + version = "1.3.2.0.20231031.80845"; src = fetchurl { - url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20230826.202144.tar"; - sha256 = "15nsn4kgh50qrcxvar1j9rbbg9d4szvyxhy13r7fq0vp9n6wv6iw"; + url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20231031.80845.tar"; + sha256 = "0bm5rbhhsl1wfrrf5ikvn368xv49fzxh375jhl9f5r5m4dj1l0s4"; }; packageRequires = [ emacs ]; meta = { @@ -5658,10 +5719,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.2.0.20221114.63606"; + version = "0.3.0.20231103.213748"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.2.0.20221114.63606.tar"; - sha256 = "0y3xl9l0c7mjppsglwnbawrq4wx402mjvgnim2ilw1d7568ahi9i"; + url = "https://elpa.gnu.org/devel/srht-0.3.0.20231103.213748.tar"; + sha256 = "1nr6faizww1nzv5lpdikbqxkc6i1hswg2qa50cybl05ycqq9b10a"; }; packageRequires = [ emacs plz ]; meta = { @@ -5694,10 +5755,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "1.2.0.0.20230916.90636"; + version = "1.2.0.0.20231031.71926"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230916.90636.tar"; - sha256 = "0i1xqg65sbwm7xy26b116ips2769wa8yiqmyvcgsbsmig4vrydw8"; + url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20231031.71926.tar"; + sha256 = "10hj6w5wyr7kw4rargk9n1iiyl0i48cc9mbv2m0vg6bnb72237z5"; }; packageRequires = [ emacs ]; meta = { @@ -5981,10 +6042,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20230915.222920"; + version = "0.8.0.20231106.72513"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230915.222920.tar"; - sha256 = "1lsc3d8sqydbhyrd9ja43y06i0qxwc0dns2n4rnnb8039y2dvfnn"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231106.72513.tar"; + sha256 = "1pbw7wrhz5h1xykbc1ihhpzqc0kki6k637wagx8yfz95n606808d"; }; packageRequires = [ compat emacs ]; meta = { @@ -6096,10 +6157,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.3.0.20230929.72305"; + version = "2.6.1.4.0.20231030.81039"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.1.3.0.20230929.72305.tar"; - sha256 = "1k0hmnr7wnkmahmqxcg2km2cr44h3fiv4x4kv9h0297jqqi2jiq4"; + url = "https://elpa.gnu.org/devel/tramp-2.6.1.4.0.20231030.81039.tar"; + sha256 = "1m8ij5xrh5yp5n70yqlxdxgvk0ap6mqnymhasncm2vqfzlxkdd45"; }; packageRequires = [ emacs ]; meta = { @@ -6169,10 +6230,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20231024.181508"; + version = "0.4.3.0.20231027.212124"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231024.181508.tar"; - sha256 = "0b092m462gndqlyv8lvfikkdqmly2w5dkbbkn405rbmki2r4bggk"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231027.212124.tar"; + sha256 = "0rzc5ks0b9nlnvggj7hn9648y5siw9qjpg8n3swlmkb68m3b2c05"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6347,10 +6408,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20231026.224925"; + version = "0.3.0snapshot0.20231101.193012"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231026.224925.tar"; - sha256 = "07akrg4z177xjway75bl7281ic78j8sl818jd52nmxhx4wxys9mv"; + url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231101.193012.tar"; + sha256 = "12hmms0yr0vybayvzkbqbp5j428lsnirzwg93f1l8m05xxs3xm9w"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6582,10 +6643,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20231015.92801"; + version = "1.4.0.20231108.202420"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231015.92801.tar"; - sha256 = "0h73z4jbwd3pmn3rfgbklnrslcd0d60h1fg3j5ykbgqd770gklhc"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231108.202420.tar"; + sha256 = "1c34pq5l7ckjlyimpa528d8a7q5pakz3li5bc4ka86mwf861kd7v"; }; packageRequires = [ compat emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 6116f851fbfff..6152ef002fd23 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -565,6 +565,21 @@ license = lib.licenses.free; }; }) {}; + bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bufferlo"; + ename = "bufferlo"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bufferlo-0.2.tar"; + sha256 = "1dvpzxlnzs037wz9xhiwiz2qrc7r2i05z6p6p0sy8i4kb6scc6gy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bufferlo.html"; + license = lib.licenses.free; + }; + }) {}; bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "bug-hunter"; @@ -862,10 +877,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.2"; + version = "29.1.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.2.tar"; - sha256 = "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.3.tar"; + sha256 = "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5"; }; packageRequires = [ emacs seq ]; meta = { @@ -1299,6 +1314,21 @@ license = lib.licenses.free; }; }) {}; + dired-duplicates = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-duplicates"; + ename = "dired-duplicates"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-duplicates-0.2.tar"; + sha256 = "1n5n961f1mrvcqfrz56734qj1ynajdjblyf4y60pw9m3fn03db4s"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-duplicates.html"; + license = lib.licenses.free; + }; + }) {}; dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-git-info"; @@ -2022,6 +2052,25 @@ license = lib.licenses.free; }; }) {}; + flymake-codespell = callPackage ({ compat + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "flymake-codespell"; + ename = "flymake-codespell"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar"; + sha256 = "0r1g0imh9azy1yf0naxif80vmzrjvn5dx3lcrlpj70xb86wzliym"; + }; + packageRequires = [ compat emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-codespell.html"; + license = lib.licenses.free; + }; + }) {}; flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "flymake-proselint"; @@ -2358,10 +2407,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.5.0.tar"; - sha256 = "11rcppg3850dbrvwsp3y814bibkv0h35rc5sf4w9qlmd5rc5ilxj"; + url = "https://elpa.gnu.org/packages/greader-0.6.0.tar"; + sha256 = "01sral1nrgkpbrajvg2pqhaj4rx48rryqfxckj3xprrs0yls3k8q"; }; packageRequires = [ emacs ]; meta = { @@ -2975,10 +3024,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.5.0.tar"; - sha256 = "07n32hfzyjzj7vjy5l7rxaldpa4hyjwharkizs2gzz66lg83wix8"; + url = "https://elpa.gnu.org/packages/llm-0.5.2.tar"; + sha256 = "1nbxdnxpbyvx5rww9mn0zr9hcnblrnk8790cih206y3p1kvs0pnq"; }; packageRequires = [ emacs ]; meta = { @@ -3704,10 +3753,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.10"; + version = "9.6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.10.tar"; - sha256 = "1lv503jf556hrv9s85q8sk6lg0rwxkchp2sn0sgdki208l0im8wj"; + url = "https://elpa.gnu.org/packages/org-9.6.11.tar"; + sha256 = "18hp5jx90wn9xsg8frql3r1kmn2q9qph6plcssj64fp34wcwxsd8"; }; packageRequires = [ emacs ]; meta = { @@ -4060,6 +4109,21 @@ license = lib.licenses.free; }; }) {}; + plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: + elpaBuild { + pname = "plz-see"; + ename = "plz-see"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-see-0.1.tar"; + sha256 = "0dmckrny21rlm5spiwx7j6q0xikzwlsrhg8yz890w47zpdxpl3bb"; + }; + packageRequires = [ emacs plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-see.html"; + license = lib.licenses.free; + }; + }) {}; poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "poke"; @@ -5034,10 +5098,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/srht-0.2.tar"; - sha256 = "1qps9vdsiy5zkz88kh9kl1hnn1wlfz6n5brzcxi28fwx0hb3ksz2"; + url = "https://elpa.gnu.org/packages/srht-0.3.tar"; + sha256 = "03am21w1gsc1af7slsxny9ga4vqd8rbabbp4rl6mkrq46y5ak375"; }; packageRequires = [ emacs plz ]; meta = { @@ -5418,10 +5482,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.3"; + version = "2.6.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.1.3.tar"; - sha256 = "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y"; + url = "https://elpa.gnu.org/packages/tramp-2.6.1.4.tar"; + sha256 = "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 7e59c5f067f2a..ccde3ca0303ba 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -65,6 +65,8 @@ in mu4e = callPackage ./manual-packages/mu4e { }; + notdeft = callPackage ./manual-packages/notdeft { }; + ott-mode = callPackage ./manual-packages/ott-mode { }; perl-completion = callPackage ./manual-packages/perl-completion { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix new file mode 100644 index 0000000000000..f9af8c465b930 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, trivialBuild +, fetchFromGitHub +, emacs +, hydra +, ivy +, pkg-config +, tclap +, xapian + # Include pre-configured hydras +, withHydra ? false + # Include Ivy integration +, withIvy ? false +}: + +let + pname = "notdeft"; + version = "20211204.0846"; + + src = fetchFromGitHub { + owner = "hasu"; + repo = "notdeft"; + rev = "1b7054dcfc3547a7cafeb621552cec01d0540478"; + hash = "sha256-LMMLJFVpmoE/y3MqrgY2fmsehmzk6TkLsVoHmFUxiSw="; + }; + + # Xapian bindings for NotDeft + notdeft-xapian = stdenv.mkDerivation { + pname = "notdeft-xapian"; + inherit version src; + + sourceRoot = "${src.name}/xapian"; + + nativeBuildInputs = [ pkg-config tclap xapian ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp notdeft-xapian $out/bin + + runHook postInstall + ''; + }; +in +trivialBuild { + inherit pname version src; + packageRequires = lib.optional withHydra hydra + ++ lib.optional withIvy ivy; + buildInputs = [ xapian ]; + + postPatch = '' + substituteInPlace notdeft-xapian.el \ + --replace 'defcustom notdeft-xapian-program nil' \ + "defcustom notdeft-xapian-program \"${notdeft-xapian}/bin/notdeft-xapian\"" + ''; + + # Extra modules are contained in the extras/ directory + preBuild = lib.optionalString withHydra '' + mv extras/notdeft-{mode-hydra,global-hydra}.el ./ + '' + + lib.optionalString withIvy '' + mv extras/notdeft-ivy.el ./ + '' + '' + rm -r extras/ + ''; + + meta = with lib; { + homepage = "https://tero.hasu.is/notdeft/"; + description = "Fork of Deft that uses Xapian as a search engine"; + maintainers = [ maintainers.nessdoor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index d0499184b785c..27ab7dbd543d1 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.3"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.0.3.tar"; - sha256 = "1kq195nmspysb1kiqcfh0kwxzp40ij9ccw1c204ayr40a0wp7ilc"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.1.0.tar"; + sha256 = "07q8s3qi3lm8g01ypvqqq0cn5jx5jrgyv74fbfam3mmz5l3mqp6q"; }; packageRequires = []; meta = { @@ -261,10 +261,10 @@ elpaBuild { pname = "blueprint-ts-mode"; ename = "blueprint-ts-mode"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.2.tar"; - sha256 = "0fyvff2zh6iiswhxcvqgnxdhq3yk5f0w4a2w0jp126fvd3ryspym"; + url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar"; + sha256 = "1ii46kmiaxywymhjlj85c3ypdnkkhgyaqgzhnkzzfz6946dchj3v"; }; packageRequires = [ emacs ]; meta = { @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.9.0"; + version = "1.11.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.9.0.tar"; - sha256 = "08vc1v4gzh1njvqhg10c07wq28r2s9qq3y7i4b5clrzgy9l872cw"; + url = "https://elpa.nongnu.org/nongnu/cider-1.11.0.tar"; + sha256 = "010sl2l9vx3k095bkgvi7w1zvb68jh7lj4plmjn98lmzmbhq7q27"; }; packageRequires = [ clojure-mode @@ -1339,10 +1339,10 @@ elpaBuild { pname = "git-modes"; ename = "git-modes"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.1.tar"; - sha256 = "0zxab7rjy5rh8y0ln9h04pvcim8a4qdpj1zs0c0dwbxcsa7v7hz1"; + url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar"; + sha256 = "15lvya85710wyyynmgq7a92lc5mrrv2nfh19nxh92mkdd3r0c3fg"; }; packageRequires = [ compat emacs ]; meta = { @@ -2366,6 +2366,7 @@ }; }) {}; package-lint = callPackage ({ cl-lib ? null + , compat , elpaBuild , emacs , fetchurl @@ -2374,12 +2375,12 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.19.tar"; - sha256 = "0zq4kbir2l5fly8a37fdp4msygswl44vhjpwpcj1zqz13w30cd8h"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.20.tar"; + sha256 = "13ff9g2lzcddi8n6bcmb7g93kxc8v9h3g9k8qcn42bl7jjy12iqf"; }; - packageRequires = [ cl-lib emacs let-alist ]; + packageRequires = [ cl-lib compat emacs let-alist ]; meta = { homepage = "https://elpa.gnu.org/packages/package-lint.html"; license = lib.licenses.free; @@ -2607,10 +2608,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20230919.113921"; + version = "1.0.20231109.110741"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230919.113921.tar"; - sha256 = "00b4bw4cqm9yc8fxz14da5ahrjrmshf3497l8p65ss0s6qby5ag3"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231109.110741.tar"; + sha256 = "19d1bs0ajc28wa49f1mphdwrpfywib5cvv3mxip6az9x6faand7g"; }; packageRequires = [ emacs ]; meta = { @@ -2986,10 +2987,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.5.tar"; - sha256 = "0qaliyn79zkpy3ppqb0s61i5hfbbcj8climj7x9c6vpq86s57mv1"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.6.tar"; + sha256 = "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr"; }; packageRequires = [ emacs ]; meta = { @@ -3001,10 +3002,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.26.0"; + version = "0.26.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.0.tar"; - sha256 = "0pgxz3ckw3qjzqyn6vr8k8y1gdiybsm47ik8j62ybsnqs7ivs208"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.2.tar"; + sha256 = "14rcg6rs4dd4a0pr4makkg1flwxfrxyg5xrs5sa034bzxj6zqal5"; }; packageRequires = [ compat emacs ]; meta = { @@ -3470,10 +3471,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.13.20231025112537"; + version = "24.15.20231105091131"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231025112537.tar"; - sha256 = "1h7z9g3307w0cg361md8mbhsia2534ncqihdfsasg5qhw9184sib"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.15.20231105091131.tar"; + sha256 = "13wvf6zn87xpglpycxmjmq6mfvpr21bsihsshx06my38832kw128"; }; 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 dfdd517b600d8..3c839bdb04196 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,14 +204,15 @@ "repo": "stephenwithav/aangit", "unstable": { "version": [ - 20231017, - 2022 + 20231106, + 2115 ], "deps": [ + "s", "transient" ], - "commit": "68aeb3761b732daedd468c9f7593947cf4cb1d9a", - "sha256": "1rrh5ki6c7haykpm5ijlgzq771p40b8gc1af0j2nlrhhxwz5f4jv" + "commit": "7527a366c542cb7b09672597876e83f429ca6b46", + "sha256": "0yszwzp2fa4v76l78qrnbn1zwfjzlwb9sihfl5xz9xiixvcv3b1r" } }, { @@ -1899,11 +1900,11 @@ "repo": "jessieh/adwaita-dark-theme", "unstable": { "version": [ - 20231016, - 1744 + 20231107, + 1726 ], - "commit": "de32d1da1d04a43c413370eb94b0a338ce1cab27", - "sha256": "0nab5ib8zqs584lm3lswc1wqciyh9vpnp83acyg9s4a11r2isnmh" + "commit": "a97d5d5f5657a52c3b4c4b146b4d307dfb1a7a74", + "sha256": "0g8fjqmz805fhqspbzmpvb90kpzwigl4z56bkykywgy2cwb9ljzh" }, "stable": { "version": [ @@ -3398,11 +3399,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20230930, - 1443 + 20231102, + 1334 ], - "commit": "eae9e73f2e36e421d7981aa2f47addc7993cc88f", - "sha256": "0y2qa0xg09w2a8wjrjrwcgh4f7im2wn2gyh28y5g73pvybchl2lg" + "commit": "dfe0d7c9905ac31716a35b37766ed6166c1f18d9", + "sha256": "0b7r62hd2lb640xvmcj6yg4kmaa0ndknbj61pjr4jkarb8v0p8k6" }, "stable": { "version": [ @@ -3816,11 +3817,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20231021, - 1841 + 20231105, + 2008 ], - "commit": "f4157e8c397896c0b984472ef7f82f444e0fc3e2", - "sha256": "1ama6x8dk5x2fw9jxwfcbygy96mx477zl368j46pjq91dkix6z48" + "commit": "54a192c3454e82be9d5ad910d80796b27d58035f", + "sha256": "0wac6qhv89c6x2scbdxhxdrjhqm3jmm7fzzvirxibyd94fxjzzd3" }, "stable": { "version": [ @@ -4467,11 +4468,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20230528, - 622 + 20231105, + 1713 ], - "commit": "3ae74c0a4ba223ba373e0cb636c385e08d8838be", - "sha256": "1hbbq85svs3g9wdknvijvrvb2nnhw4f75dsd3w986s9srddl0pwv" + "commit": "3bade0e92e1ee8e716c5db14bc8315b17299f138", + "sha256": "13b88shazsi7crn8cpb3f0k4vzai45srymwriq14axmq48i8z33m" }, "stable": { "version": [ @@ -4575,20 +4576,20 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20231021, - 2251 + 20231110, + 1334 ], - "commit": "8ab4e373e7bd3217cad4d4130ac765abc5b83add", - "sha256": "157z9yr74a0m38vi1n2zl6rzm5d1vnzg963bvhrymdpxn7s2wcrc" + "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", + "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 1 ], - "commit": "1cab3bfbc8966fb72a6830ecb960906ffd1dc800", - "sha256": "11b9bi5znxhxwh6gxqrx27r47kxvwda02d45jy6djvndy3wbfygv" + "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", + "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" } }, { @@ -8844,15 +8845,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20230916, - 2043 + 20231101, + 2319 ], "deps": [ "epkg", "magit" ], - "commit": "2b38da4f44cba8931f84d7a8c73edf320dc60375", - "sha256": "0m55fs9qfi12xgwxps8f1db90fg7ja096xln4fssk3f8a30sa5r9" + "commit": "d8aecb09193448de12d5a19ac7bf242f3c39e767", + "sha256": "07lfdmfs2bfn9a0zq6jvh8mizj0sr02ngib6fil9w31rlp7p8gnn" }, "stable": { "version": [ @@ -9193,11 +9194,11 @@ "repo": "browse-kill-ring/browse-kill-ring", "unstable": { "version": [ - 20220410, - 1509 + 20231104, + 1450 ], - "commit": "6e06736a8245a8cdf436f6585c71439239219836", - "sha256": "0i7np8bz7v3j19z33f0cq0fx096d3h6p130md0jmzgq945lxvp3a" + "commit": "03cc18c08a549568edb6bc710c307c19bc507ef3", + "sha256": "0bvcs6zsp2yinr71cnvyb40a2vwv2p0v98bhjxcfl19namalh7p3" }, "stable": { "version": [ @@ -9247,11 +9248,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20230914, - 2107 + 20231110, + 943 ], - "commit": "8961bea9902ff8548bd771ed3492731630420bdd", - "sha256": "0fxkkr9mgf947lbckagdwi45q675f8qj4ld48pvg0gnjyczpja4i" + "commit": "0238406db380b733708e4ad7e5a75aeafe6a2640", + "sha256": "1rrjhkhsgfgzcbwgn6hlzh3n87205jj9yk3qpaflqhw83axms5jh" } }, { @@ -9397,14 +9398,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20231008, - 1028 + 20231028, + 1617 ], "deps": [ "compat" ], - "commit": "9a0878dbfed33adf171bc389116d81f326161a64", - "sha256": "01b32xjlqc9h3dwkpmkgfq4mdpfj72ym7pw11h14s5lxv9l11mbk" + "commit": "8ba30f5b7df3a219e792377b1d7163a536896a4b", + "sha256": "0ai2n443l3rp3pc40ppxsaldbsbqqx6822h4kk7zj6f84f9nf7cp" } }, { @@ -9668,8 +9669,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20231027, - 1517 + 20231108, + 29 ], "deps": [ "burly", @@ -9679,8 +9680,8 @@ "map", "pretty-hydra" ], - "commit": "d8d52767b3e0afe00a5166f00897c6d7baea1f90", - "sha256": "0xgw4bhp3gd9acjwd1f00g84hj7wlsvh8m2ll1cc2gjhsywl5kxh" + "commit": "5b76a6c7bd53d0f2fe5993b7c316da15bb2cd3f5", + "sha256": "1a67iykwb5m12famy04iw695kv5gnk8f944y6cnvjlj71dx7h9y4" }, "stable": { "version": [ @@ -10577,8 +10578,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20230809, - 927 + 20231107, + 302 ], "deps": [ "dash", @@ -10588,8 +10589,8 @@ "s", "transient" ], - "commit": "588039aeb471c0bdabea36dab5e1c37441d38fed", - "sha256": "1kvnyc3gz6p8l0ssf9cqb9iwyf7wl3df9gnz9dp00v2hvx797y63" + "commit": "124c916f203511c64d03fac28d303dfb102a6ead", + "sha256": "0qmqk7a9ci3zwq6sv642898axnq9bw9nrb920s2yza43nj1pc860" }, "stable": { "version": [ @@ -10756,14 +10757,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20231022, - 1157 + 20231029, + 1004 ], "deps": [ "compat" ], - "commit": "bee13e568d42ffec9010fbf795e8f942973da174", - "sha256": "1hxlb2rbbjvfaq858v9cia7msmmpzm3nl5vygaxc1rqyyw6b7wn4" + "commit": "085287d793ea2fd06b47ebcb6ab08e88533e5185", + "sha256": "02achp9avmd7bhpvx70lxacs2h1lpl1aigj0ism4dww8vff9qv63" }, "stable": { "version": [ @@ -10918,11 +10919,11 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20230213, - 401 + 20231106, + 1948 ], - "commit": "6e128f08692aae5723122e039e8871a57141e868", - "sha256": "044bc09bmkzzrrd24niwsz5cr52kg3wbhs7qfmxmypyqzzdj3kcd" + "commit": "3fecf5d78f3c23579f3b3379efc436005c475682", + "sha256": "1iwg4zia4x1ydz2mvpmarzv0s7kih6zcxiq2ya8iqahr1xrqx48l" } }, { @@ -11148,11 +11149,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20231012, - 1710 + 20231106, + 1241 ], - "commit": "89e4013d9ad35f55666ca44c4542d32698641969", - "sha256": "1kzm3bgsy04pj5b04ljizl6jk614jl4r39lbnws1g0icsdbghqxh" + "commit": "b778bb48be7111e19f27dc99891b515074496f82", + "sha256": "1nynlmwdzy1mgzx4jg3c7llffk19hixzk7bbsk6m1zhxgnsickqh" }, "stable": { "version": [ @@ -11661,30 +11662,30 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20220221, - 1029 + 20231109, + 1008 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "4cf56affe3035fda364109836e26499431095185", - "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" + "commit": "ac122af751ba9903599c6eb9c3e9e12a375e19d0", + "sha256": "1712a7dhiw6a2bj4qq916dx2gk3124g7shxnizyy3nsvc6q08cdi" }, "stable": { "version": [ 1, 0, - 3 + 5 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "4cf56affe3035fda364109836e26499431095185", - "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" + "commit": "ac122af751ba9903599c6eb9c3e9e12a375e19d0", + "sha256": "1712a7dhiw6a2bj4qq916dx2gk3124g7shxnizyy3nsvc6q08cdi" } }, { @@ -11695,27 +11696,27 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20231014, - 1347 + 20231101, + 1742 ], "deps": [ "buffer-manage", "dash" ], - "commit": "054f4f8f69a56cce3f834daa9ecf9d13bc348055", - "sha256": "00msjrhyr9qsgpd5i8xas98dx47q1fjvw5dqk2b78rmdavvwcjyj" + "commit": "d0f8b36cce8a9f2e1caa373e8c336c16d092c2ad", + "sha256": "0649k683y8yd73s9za02cqy44rd71s7zcb9qgnx39ygky10sdf3x" }, "stable": { "version": [ - 0, - 4 + 1, + 0 ], "deps": [ "buffer-manage", "dash" ], - "commit": "38544521e82befc06e397123a118dd96dda2c6b6", - "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" + "commit": "d0f8b36cce8a9f2e1caa373e8c336c16d092c2ad", + "sha256": "0649k683y8yd73s9za02cqy44rd71s7zcb9qgnx39ygky10sdf3x" } }, { @@ -11931,14 +11932,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231027, - 1804 + 20231108, + 1115 ], "deps": [ "shell-maker" ], - "commit": "7f11d4a8d979473ea7390cfcbed1ba1ab0fb6732", - "sha256": "0p5lf0r8ldqq8khcarih7msz3pwlzsmzgs2im4dp4akskjqqzbqq" + "commit": "a05e30073f42eb6c10dfe0741ff86d3c22e914b4", + "sha256": "07j4pvb7li43c6ldakzfyj88s20f0dnfzn0ilpvf76i5q66hpqcr" } }, { @@ -12269,6 +12270,21 @@ } }, { + "ename": "chip8", + "commit": "536ac9407a1f164cff51473b7074e5ddfbd26063", + "sha256": "0b2nwc876dkv68j8l6x0s1gy2qzyqbwyl8msj9703wpcv4sv6bll", + "fetcher": "github", + "repo": "gabrielelana/chip8.el", + "unstable": { + "version": [ + 20231028, + 952 + ], + "commit": "1b3ba334184efb39ff03877cdce705cbf08ca9e7", + "sha256": "0a7jbb355vyyc2ihbiyaby9y6m3mp2cfaivicsmc8hb9qwadwx7x" + } + }, + { "ename": "chocolate-theme", "commit": "77ad3eb92e1f7016ed703705697b3cdfe811c387", "sha256": "14slzm0c1lwclmk73ivhflf2kkwmxr3fxy3c2h9r6x7p1z4l32d7", @@ -12549,14 +12565,14 @@ }, { "ename": "cider", - "commit": "88bf5f483cc9b1f8ebdc1446a37c9829d77bca4d", - "sha256": "0ha0kxgj3falxyb0ikid157zm6xhan64p6b4dh5kwm90xkh3dhdm", + "commit": "f991f70ba1fdf25301e10497bf6e0c6b4bf62fa9", + "sha256": "1vgi1sx5276b4sds1ik4205f0rq4ijsdiv5klrrdk0918ybwilh6", "fetcher": "github", "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231025, - 508 + 20231108, + 2054 ], "deps": [ "clojure-mode", @@ -12567,13 +12583,13 @@ "spinner", "transient" ], - "commit": "6437f8fe053ada1f5839ff749c3d1b3cfcfd4edd", - "sha256": "072qw9gk11nmgpzgccq01pc32figb547kgw1lxq0m0fkwl1al2k9" + "commit": "bf9dceca17e912605e2d8327c44ed241e2a556e2", + "sha256": "1wca624gdnrqlkadlqafj0xibma8xgsh9qqpzynr6b8q2vmff98j" }, "stable": { "version": [ 1, - 9, + 11, 0 ], "deps": [ @@ -12585,8 +12601,8 @@ "spinner", "transient" ], - "commit": "65ab78c7321f1084922653c33b5085ba6633a100", - "sha256": "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp" + "commit": "6e5294624959736c486f7a466bd5e78ce6183ab9", + "sha256": "0zr3p8isidfh9w44cjq50wk13balbswyyn2ycs368afkraqbry5w" } }, { @@ -13837,11 +13853,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20231018, - 922 + 20231105, + 1254 ], - "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", - "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" + "commit": "481ca480e8b7b6c90881f8bd8434addab1d33778", + "sha256": "09124cnvq7cnllsnbbshx1frbha6sydjgzn00k3rkyxclhbm8vhd" }, "stable": { "version": [ @@ -14385,8 +14401,8 @@ "repo": "ag91/code-compass", "unstable": { "version": [ - 20230527, - 1309 + 20231108, + 1618 ], "deps": [ "async", @@ -14394,8 +14410,8 @@ "s", "simple-httpd" ], - "commit": "f55155ef7c098aea4275e18211cd45ad028a5f82", - "sha256": "1vfdjg7km57wky28xfjhbxqx16lqrq04a3gspgl5i6fii44wqajw" + "commit": "67ec53f9ca43bea941ec5ba6fccba8565c1d937f", + "sha256": "1k6cc2m7kdr6g69cn7r3i43cq6iww74sqimlw6q1paf66lm35xld" } }, { @@ -15250,11 +15266,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231023, - 1033 + 20231110, + 52 ], - "commit": "66201465a962ac003f320a1df612641b2b276ab5", - "sha256": "0cia8xic3a1z83mwqnjsfa3nz396zzjwpp8vb0784kk3n7964is6" + "commit": "07d1c41f83d5ad5f6263e726283a05ad12cd37a5", + "sha256": "0f2hnypzdggfw8dxyysf05n51za86qs1z6b8syrdnkyxcm41j793" }, "stable": { "version": [ @@ -17385,10 +17401,10 @@ }, { "ename": "conan", - "commit": "7eebc91812072c0f65c95ab9829f31505f880331", - "sha256": "0n829m79pr85s2c7h582bpv040bx9n9pqwni8ascxdnn8rlm8dzf", + "commit": "c24ee40734e60c2a06c5d330f5a788996e672af6", + "sha256": "1yaf60428qpn44m8s5z7d8bksb82d8q0zwx2r7k1dh4n69yqa7p1", "fetcher": "github", - "repo": "carl2/conan-elisp", + "repo": "Carl2/conan-elisp", "unstable": { "version": [ 20231016, @@ -17440,8 +17456,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20230620, - 1745 + 20231109, + 219 ], "deps": [ "dash", @@ -17449,8 +17465,8 @@ "pythonic", "s" ], - "commit": "6a6a27dad7ab696b41b54a1cb7591ca489133fec", - "sha256": "0hxas37xbcwrx981bb90hfj3an794injvrx8r0d34p581j02amsq" + "commit": "60e14d1e9793431b91913a5688e278bd91d56224", + "sha256": "1irrcdm3ckbafsjr442i9iljsfjqsg5mj79hzwps2k1j7b911gy1" }, "stable": { "version": [ @@ -17604,14 +17620,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231023, - 1543 + 20231110, + 926 ], "deps": [ "compat" ], - "commit": "fa249d5dd7212e5ae1fa51c086d8f1197d738ef4", - "sha256": "12h79lc9r5rgmivr2v8ilk4fw9lw8yh0jv4hc7jksc9dgriwxx9k" + "commit": "f36be0c05b9bea10cc7b477a7c82a196cee7c58a", + "sha256": "0n604z8xviwc58944d33zxq20xyn3i01rvh28av1mx4hvlgjd1zp" }, "stable": { "version": [ @@ -18175,26 +18191,26 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20231027, - 1150 + 20231109, + 1538 ], "deps": [ "consult" ], - "commit": "a799f1a548e71151b5c0f625c9a532b670c07eb9", - "sha256": "143ihhan50nyfqznw6b331ms5776hq187q3k2i0ha8fcqasycxic" + "commit": "e4cc88be7b66c45d90e5685344cda392f54fe5ae", + "sha256": "0h1x29a242gsq36h4hf9wzjq2mxvbqxi0mwkxxi5g0356lk7jqhw" }, "stable": { "version": [ 0, 1, - 0 + 2 ], "deps": [ "consult" ], - "commit": "4f846ef7ef4ec0fbb4c62b603567c270860638e8", - "sha256": "1wb8sfmx0y5xwk2yx5alqspm9ddq9mzxfwwcccw8267kqkm3gs3j" + "commit": "e4cc88be7b66c45d90e5685344cda392f54fe5ae", + "sha256": "0h1x29a242gsq36h4hf9wzjq2mxvbqxi0mwkxxi5g0356lk7jqhw" } }, { @@ -18390,14 +18406,14 @@ "repo": "sshaw/copy-as-format", "unstable": { "version": [ - 20190523, - 258 + 20231104, + 1933 ], "deps": [ "cl-lib" ], - "commit": "a0962b670e26b723ce304b14e3397da453aef84e", - "sha256": "0amgnl9d9sh69dh76vfb7ar6m995nka5zs3swa1pmqqnrmp8nr1w" + "commit": "d4a88544d3e89385cc401f2026e8d46ca02e7ca4", + "sha256": "09c5ic11iikldqhdfrym57ry167dxln5bv75vv459xzf0nw9iqaw" }, "stable": { "version": [ @@ -18532,14 +18548,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20231013, - 1857 + 20231108, + 1746 ], "deps": [ "compat" ], - "commit": "b2b9a2312f58117514724e729fda43efc4433ecd", - "sha256": "1vdj8h2linwmkhr1f8zhwhskdknaacid4mc6lnp3cyj7mnlryfq4" + "commit": "42efcfd28f6286110cc2ba0d90ffd67a81e0667b", + "sha256": "0ns0xli4l53vxmw8bshnqqi0zm85nld6p2vw30psfpgaz70j2zqy" }, "stable": { "version": [ @@ -20833,14 +20849,15 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20230717, - 1627 + 20231030, + 1710 ], "deps": [ + "compat", "s" ], - "commit": "060525c13eeb385b20898da93610dbe964f446f9", - "sha256": "0ang2cj4na3r5hf7pj35vnfc1x1g9c6fjvyznwcxfm8bjj91kpn3" + "commit": "c329ca135e3e33a4bd6d898d2e803a6ca4e64b47", + "sha256": "0b7pml68w9v0qzi492470awdzy670mblw4459xyyyzj9p978lj8b" }, "stable": { "version": [ @@ -20890,14 +20907,54 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230807, - 1640 + 20231109, + 913 ], "deps": [ "shell-maker" ], - "commit": "b2e46cfa69d7cc514b5c2f9a31c1ca63a8bdea1d", - "sha256": "058ir6pfd4jzswry9rap161rz15f59k8d1zxxwbkm9ixisqkldby" + "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", + "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" + } + }, + { + "ename": "daml-lsp", + "commit": "d6812a37b3817aa189188eaca4c5fc400af69b8c", + "sha256": "14cx2mdr6kybhj146xvvx5vxzqy38s9znbvjg5y14l022sqajz87", + "fetcher": "github", + "repo": "bartfailt/daml-lsp", + "unstable": { + "version": [ + 20231101, + 1818 + ], + "deps": [ + "daml-mode", + "dash", + "f", + "ht", + "lsp-mode" + ], + "commit": "26ea6a1b34c49aaa5a2b395a0468c8af710bfab7", + "sha256": "1n478pf1nq5g1h4ixry15f7iv0gpslcwya3a01m008vs8h4i557a" + } + }, + { + "ename": "daml-mode", + "commit": "1d9167b45a48f8ed36e4d62578abe29d3d350005", + "sha256": "0pr1m78qffxzzn5qqk63y7hjxwj8jmqh0i6fzps662a103iqzsim", + "fetcher": "github", + "repo": "bartfailt/daml-mode", + "unstable": { + "version": [ + 20231106, + 916 + ], + "deps": [ + "haskell-mode" + ], + "commit": "3ba1166edd4c22402996625b1f8a05a2d5b1cbc6", + "sha256": "0vdprvf0zswng8i2zy2jwwwyannigpicwhhdd913akzsyzmjnm27" } }, { @@ -20908,11 +20965,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20221121, - 634 + 20231110, + 722 ], - "commit": "39ff00f8a40bcab96afd9450195124b57becd625", - "sha256": "0iqljbvl4rliaj2lkmwl7ls94kx5ig6gi9c8gddk8l61b7chrqyl" + "commit": "b3335e44f468c019c95a8210ce1ed9fe23c65735", + "sha256": "19lncwxzxyi73cn7439rk8cvgcj6l4x1kj6fykmw3b18s7rj555f" } }, { @@ -20964,8 +21021,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20231021, - 532 + 20231110, + 659 ], "deps": [ "bui", @@ -20978,8 +21035,8 @@ "posframe", "s" ], - "commit": "1187c6982fbc886e633b68359d64f8e5d7750151", - "sha256": "11cpsrbmqzamq9ply0pbd983lqsas8wxym0r476bv2vx2bqkaqpc" + "commit": "f6706fa917aecdd1ebf71ee217724622cc6a97e4", + "sha256": "0jjnhl5hrpvdd4qb3jz6pdjgrp9qjxbm5dbgdhi6bkl2jhxy93fv" }, "stable": { "version": [ @@ -21338,11 +21395,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20231012, - 1943 + 20231031, + 359 ], - "commit": "427cd8e161232904745dc7870a36ad55ebf65753", - "sha256": "1pll099gz1v9kip24lmsfhn419fbfgjpavjl5w9zafj4yqmi2ipl" + "commit": "22786237e16cfeae33f07ae9c5eeaf061408579a", + "sha256": "0la3vfz1qyv687j4n3kky99dla3dh89hh5zhc9v3rbh562jdgr0n" }, "stable": { "version": [ @@ -21767,10 +21824,10 @@ "unstable": { "version": [ 20231017, - 1022 + 1037 ], - "commit": "60aa194454a7adb82790b6455c130ecbe93cb2a7", - "sha256": "0n6idayngdsb5vsr2brzj1dhq2rxv7jdsf0jns386aq5cmpjzvig" + "commit": "586300cb4747128b7f8397d9dd9f09fa1e27b118", + "sha256": "11fwr66nm51n4kmy8y5zpa5lwy4qnnspsbrpbiv3r0p3ivqdga15" }, "stable": { "version": [ @@ -21894,6 +21951,21 @@ } }, { + "ename": "decor", + "commit": "6455cfe4559770fc53348eb3ddd8dbf6e0c3976b", + "sha256": "0rz1n7qrddy7qh50x04n3bjxkbfdmiqa0v9055clbc2f16snknsg", + "fetcher": "github", + "repo": "KeyWeeUsr/decor", + "unstable": { + "version": [ + 20231101, + 2354 + ], + "commit": "aad4fa9f4e0d4140e2707f4cc678b1dc3c0672fa", + "sha256": "0lxw55l0p5cgp1kgwh0yzh9bc3wvgnd932jmfy77nmiw6wl4achm" + } + }, + { "ename": "dedicated", "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", "sha256": "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9", @@ -23366,11 +23438,11 @@ "repo": "hjudt/dired-duplicates", "unstable": { "version": [ - 20221007, - 703 + 20231109, + 1353 ], - "commit": "3c16f563880453ad65e1b19ec92d7c4c5a6269f2", - "sha256": "1h80636fmdc1ykkqapirqhh86vqln80c6h71iwnsq351s4mrly74" + "commit": "349eebbd8b3fc10fa2a4551426769d20744e2eb2", + "sha256": "0zpv0112xphvci5rdw04qai9pdjf2ig6jf4kianwjzlgcrma5zar" } }, { @@ -25055,8 +25127,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20231005, - 1918 + 20231110, + 1006 ], "deps": [ "aio", @@ -25065,26 +25137,24 @@ "tablist", "transient" ], - "commit": "61bb3ac0f2195a7a592df0453fe9f404bd92f9b1", - "sha256": "0g7sgf38ihza30mli1bi82nmn8plkjx3xm76ykg1s66j1ihfhb3p" + "commit": "2def2ab7fa04ed14403d00e3547a94c3822302cb", + "sha256": "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460" }, "stable": { "version": [ 2, - 2, - 0 + 3, + 1 ], "deps": [ "aio", "dash", - "docker-tramp", - "json-mode", "s", "tablist", "transient" ], - "commit": "bc11d5e4f21eed57e482116848af1f5c9e21bd3b", - "sha256": "1743x2s7ss7h329yayima3pqi62f0qjv56g5y6b7iwk40wpnhv9v" + "commit": "2def2ab7fa04ed14403d00e3547a94c3822302cb", + "sha256": "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460" } }, { @@ -25443,16 +25513,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20231027, - 619 + 20231028, + 1505 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "1df1a7e49015004a7fb54f7baa8fb1767b3960ec", - "sha256": "0zgwdryws6817pj4jldxas9khfzc57hp0cc0vmgbr8izsqqkidhr" + "commit": "dc15e932d8be149c9417a00898db229d9a2f8e6f", + "sha256": "0j2brh0crzfd5nbwk1ss14jsjfi7b7ynqwg0ml7wc5srwlqmwiqi" }, "stable": { "version": [ @@ -26331,11 +26401,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231024, - 1346 + 20231109, + 856 ], - "commit": "19be1c2f3792c95f04fd369cb931a52f7df9cfd5", - "sha256": "0fc43n3958b5ix304zigsyz5d5i0gx35lq58lfg40qmc9lhm5hym" + "commit": "642a907fdec8b765e777d0c9656388694a15dae9", + "sha256": "15fsn7dp6jngyl8457rcrsq243r93plamn4wdlidgm3kb05lyaqk" } }, { @@ -26799,14 +26869,14 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20231017, - 1227 + 20231103, + 840 ], "deps": [ "dash" ], - "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", - "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" + "commit": "2f8ad56c8d9b3e6226b6641de1f8b61571225950", + "sha256": "01dbyplh6gwkk85amrx916h1lxjdbnvps7wqai3ny9wfixh7w0q8" }, "stable": { "version": [ @@ -27066,26 +27136,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20230920, - 825 + 20231103, + 2 ], "deps": [ "parsebib" ], - "commit": "568aa9c28a86c58b8c11a6fed468f355a80013e9", - "sha256": "1z67ssllrji9fc7hg378bhsdjw6rkz3djwhr924gvw2wyb6b2xvz" + "commit": "6381458947bc6fb6c0605469bceb92784a9fbd67", + "sha256": "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay" }, "stable": { "version": [ 2, 39, - 3 + 4 ], "deps": [ "parsebib" ], - "commit": "374400c99f600cfda703da4fb8d16898be48cb74", - "sha256": "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc" + "commit": "6381458947bc6fb6c0605469bceb92784a9fbd67", + "sha256": "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay" } }, { @@ -28819,19 +28889,19 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231027, - 1758 + 20231107, + 2029 ], - "commit": "108bccfab4e566c72d16401a675a5fee7ebbb3d8", - "sha256": "16f5ynyvphp58g1fgzqdicd7cj0xc12mx7mi3wzhr6gy9ll510mz" + "commit": "ce5f3e14d7c5ab21dfb3e50235bfe495808b705a", + "sha256": "01ax4nzdby25szjmy63fmxjd8hf0a6hkkj555xylldq9bx5ax899" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "fadadf9d91b2a76db231fbd7bbd70d3023ac584b", - "sha256": "0m2d607hprkl1pdapxsfjwag7plf822ig59qb6jjzy9m7gwg21k5" + "commit": "9ae24a8b62643d6e194d0754611dc014304c1183", + "sha256": "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5" } }, { @@ -29925,15 +29995,15 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20231027, - 1759 + 20231105, + 1147 ], "deps": [ "llm", "spinner" ], - "commit": "2e5219afbef9ae0c9adc288d3d13b21e49c847d1", - "sha256": "1l551x979914nznczi2n697ykwcpcr40w61c0ivq46fnvzg9sdl8" + "commit": "702042c0bf79a4e81133fb2acb9031f5eae817b0", + "sha256": "182i95q0n6r2i774f66jkkmd172d4r8ybhqvayxfmgxr2ryfqwjg" } }, { @@ -31040,14 +31110,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231026, - 1842 + 20231105, + 133 ], "deps": [ "compat" ], - "commit": "99cb35d7d228f57ce8e096f0c3afbf4335aa307b", - "sha256": "0r9y6c0hgd8qsv05w21g8h575b7m8hn4xi8zhmjhs1vswxgwidmx" + "commit": "8c57c361d686d352f22bd570fee4976f6ab42bcc", + "sha256": "0cnv6lzbrl8pa8p4v3llm1alas5p1zs32nndsi626l2aqbjyfx8z" }, "stable": { "version": [ @@ -31245,16 +31315,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231027, - 2131 + 20231106, + 2235 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "cdea73e122e07c39678606bf876be925589a51f9", - "sha256": "0k8c2c2aaa7byzf8bm5iayfz1h58igsy2mic7ibbm180m69yl1rm" + "commit": "f3701eea3d0159ea9a2b44c5cce3886be73ff3df", + "sha256": "0dblq6d938hxw0y4920653qqp8m6p1g91qgg311idc5azzy3hdp0" }, "stable": { "version": [ @@ -32751,30 +32821,30 @@ "repo": "positron-solutions/elisp-repo-kit", "unstable": { "version": [ - 20231025, - 252 + 20231106, + 404 ], "deps": [ "auto-compile", "dash", "license-templates" ], - "commit": "f664196ad5736ec03ff04b4566a363309b8ceda4", - "sha256": "01hx2s9x4zz1d33br6hxc2x9wdf09fcn0rq09fmy96gq74cbjf5n" + "commit": "49611de3ed000b5872c63270dd66efa0e6bf76c9", + "sha256": "1fq1fsgs0dklal5d3gxbb8anaw9kgixpcjzyvvia7lxzlfc7chqv" }, "stable": { "version": [ 0, - 4, - 0 + 5, + 3 ], "deps": [ "auto-compile", "dash", "license-templates" ], - "commit": "6e5eaa8b6317d596d0721a3d7656bfb89ff2f847", - "sha256": "09gy3p94cpb2ray4jvpxf1cyjzylvxczhn7m76wx8ppfsg221say" + "commit": "49611de3ed000b5872c63270dd66efa0e6bf76c9", + "sha256": "1fq1fsgs0dklal5d3gxbb8anaw9kgixpcjzyvvia7lxzlfc7chqv" } }, { @@ -32785,11 +32855,11 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20230905, - 1428 + 20231110, + 1018 ], - "commit": "43d277c384c17ef0c46df70db8c0bb68b8f873a5", - "sha256": "04p6qzr8gg56gv2h9iq1lshq8rp62mp392whvjqnbfz5710hk748" + "commit": "bd55bb110c2ae8e51e14f4a26c9116e1db3b3cc3", + "sha256": "0md6bd463lz806463g9wch3xmmdqaddbbya2mnxx88ncfijx86n3" }, "stable": { "version": [ @@ -32943,8 +33013,8 @@ "repo": "rejeep/ert-runner.el", "unstable": { "version": [ - 20220513, - 1142 + 20231110, + 1358 ], "deps": [ "ansi", @@ -32954,8 +33024,8 @@ "s", "shut-up" ], - "commit": "69d66b934223d5f1801ba3a4c8dbfb3453f2a041", - "sha256": "12hy1wnrs9dq2hl88fbybjv18a5fh5az5vpcrrxihrwy2gi2yrw0" + "commit": "98a5a6f683663f9f0357459d75ce1dc36c987e4a", + "sha256": "15c3hny1nh57gx8jc1mb28j4cnyn6n3h1hy3b0zdiirdwrgd05bi" }, "stable": { "version": [ @@ -33400,11 +33470,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20230601, - 246 + 20231108, + 2313 ], - "commit": "8bf0494ca71944b9d4bfb8ec3c93ea29d46bc2f9", - "sha256": "0jfsinfbcdzznsrbd615r72vn4vw6cq87pkk22h17g0p8kdf1li2" + "commit": "4ac27eec6595ba116a6151dfaf0b0e0440101e10", + "sha256": "123a2szd95nd43v2397087ayahp7azqm5arzh4fmqi1kdch4w3sp" }, "stable": { "version": [ @@ -34400,15 +34470,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230919, - 2206 + 20231106, + 1213 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d28206ccff74bc07ba335b8ff77805564f6928d7", - "sha256": "1jdrrj1rh43nx0kzh5h7cnrr9yjs6mkm5p7ld82sbq77mbnghzkn" + "commit": "c4f95fd9ec284a8284405f84102bfdb74f0ee22f", + "sha256": "07frgwzj6jfrcln6vc4c0pahgfrbrky50gz3mzck781xpmvkhwj9" }, "stable": { "version": [ @@ -35879,11 +35949,11 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20230827, - 118 + 20231031, + 852 ], - "commit": "380de63bbb32dda00434d50f47e187f9cbf89b32", - "sha256": "13kc0a18h8p7xq8h7jm21shadd6pyg6d2b5wx5r6ni3g0bdlh47q" + "commit": "2358f3e27d89128361cf80fcfa092fdfe5b52fd8", + "sha256": "0nssajjkmfhd9nvdvvkkja2vc1x2hwlpj3amnzry35jnbfq35c5f" } }, { @@ -36136,8 +36206,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20230419, - 1753 + 20231108, + 1749 ], "deps": [ "avy", @@ -36146,8 +36216,8 @@ "tree-edit", "tree-sitter" ], - "commit": "96631e26d96645172934011abb2a53ab1e5861d4", - "sha256": "12cihsgqwim2r7hyl5l3b5n3malnkmh26scf6d7bydpvd66d4ml2" + "commit": "f5e2b467f14a2980dbe1a862ce0b27e768b2e980", + "sha256": "1xf4aygk4vc0pi590ca9nm1j9s64bv018xz5w8g4ln7rgpwdk408" } }, { @@ -39627,14 +39697,14 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20220221, - 1029 + 20231030, + 1003 ], "deps": [ "flycheck" ], - "commit": "4cf56affe3035fda364109836e26499431095185", - "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" + "commit": "0eb3dd630391e4d8a26e09c9032cfb9f4bd71e08", + "sha256": "1zk3rjabmpfl37zrnnim4h6cbnwp9vg8yjwirw8hjsayfh1pp0kk" }, "stable": { "version": [ @@ -42219,14 +42289,14 @@ "repo": "ROCKTAKEY/flymake-actionlint", "unstable": { "version": [ - 20230731, - 753 + 20231104, + 239 ], "deps": [ "flymake-easy" ], - "commit": "98a47bc6ae2d31f699e98caf8093d5bb8cc04771", - "sha256": "1bcnqgwdyf7c8zim7jfaz2pfnldafnlqg65cklbydyhsa1rflh5b" + "commit": "17ee78db1e1639ac8272d5c0919b82865b638aaf", + "sha256": "1ln8ajn6vscnq4wkyqcqd8lw5bx2ypzi9qr9piv895g73667bd4h" }, "stable": { "version": [ @@ -42264,11 +42334,11 @@ "repo": "mgmarlow/flymake-clippy", "unstable": { "version": [ - 20230826, - 1702 + 20231102, + 1616 ], - "commit": "d0774403fe96d88bd629d0825ffca46a1786d697", - "sha256": "1gw7xqfw5lsp16jjipb0q49i08qsbkd03sam2ay3grry1cph6d63" + "commit": "62c670c19e575a0d7dd723cbd195c18de60bb494", + "sha256": "16bhyssaqmg3sw34ilp9h8kwfp45jrirday0pwr1qvx2skdfry5m" } }, { @@ -42437,6 +42507,36 @@ } }, { + "ename": "flymake-eask", + "commit": "abc9fa5374d7e748aa7265898ccef1483e7def3e", + "sha256": "1rhicc3hbbrl9i59icchmmyki0271587vl7w4r2a9iw8cw1gl5m5", + "fetcher": "github", + "repo": "flymake/flymake-eask", + "unstable": { + "version": [ + 20231022, + 1740 + ], + "deps": [ + "flymake-easy" + ], + "commit": "82204f96fd4168a7641df81fd90cb6d8561914f3", + "sha256": "1ipc337bgrb6z59pr1dxwhxbky7c7x4jq7xv0n0fqyvnwbvgj8q1" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flymake-easy" + ], + "commit": "5e1a3efa93e823da95ac4c1e79ab3812c112e6aa", + "sha256": "0k39wkcck9gy8bc6aj0lzq2l37ni3hcgqm65hgkfq7s1asd83ppp" + } + }, + { "ename": "flymake-easy", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v", @@ -43360,14 +43460,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20230620, - 115 + 20231105, + 2043 ], "deps": [ "project" ], - "commit": "7e3f88068b75d797e1efe0fc194f9725469f126e", - "sha256": "01wpp32fgqy1rsgdvmg1zkck7bkh8ciavhswsahv8sx3wpj3gp9v" + "commit": "8b2392c45538a377fc3c8cfcda73165652b660ca", + "sha256": "0sagfcmbqw5q21d4wy9cs2yhpy53qa53amwwk3kih9ka64fnyhzy" } }, { @@ -43469,11 +43569,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20230129, - 2035 + 20231105, + 2009 ], - "commit": "f7921a5b762eb0675b8fca7cfb00273a76eaee5b", - "sha256": "0yvf3bq04aljx93p9c3l8jgiwpmbwvkknx06zzscd1fn5n3kfava" + "commit": "598dff268231f74ba902e2c607c85dd014fbee28", + "sha256": "0r32vhb9krjhq4xk0bmzk43x756jcw39k7vl0ps10zha7p7mnm69" } }, { @@ -44274,8 +44374,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20231011, - 2149 + 20231107, + 2046 ], "deps": [ "closql", @@ -44290,8 +44390,8 @@ "transient", "yaml" ], - "commit": "6c040484eec3e95335909589b01103dd2b484a58", - "sha256": "0cilqdk94y45f3pxrward07qr6nvqcg2i1f62v99hv8j7znz4l6p" + "commit": "5dcca0e0c0378499b086543be2ec292ddd8beb5b", + "sha256": "1zfr4ci3vw7y6nq9j75smdga02nzqyrj08v35qd1i7j7kdpppp3l" }, "stable": { "version": [ @@ -44361,15 +44461,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20231020, - 1907 + 20231107, + 1932 ], "deps": [ "inheritenv", "language-id" ], - "commit": "27704b8f072525b02249ae21c4db9071950d9a01", - "sha256": "13xmz3va3haa03qjarvhdk3y8qqqckd06gvlrlvp3li1vx44rddb" + "commit": "6adf79ec74d52862e9afb910303bfa04ac9db604", + "sha256": "1x65gycrfw5m2ak7fdnqk0ysv4s65z64a0dc1nda7l5qfy425pll" }, "stable": { "version": [ @@ -44509,26 +44609,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20231027, - 359 + 20231104, + 453 ], "deps": [ "seq" ], - "commit": "a9c521590e720ab151ed601baf924928bce40bd7", - "sha256": "1ja13x0pqwni367y2vzjl2py4q8v0q5a2f8m5ngps6fppn6hbxjz" + "commit": "e2c0b952b297d99dd16f2d55f883eec8bfdfa896", + "sha256": "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298" }, "stable": { "version": [ 3, - 6, - 3 + 7, + 1 ], "deps": [ "seq" ], - "commit": "1f2004d6e905dab5b8dd7e1b068e4df86596d955", - "sha256": "18s1dp2n9q6f3py3f1yc3918yqpncdkwkgi3b3bc2868n6sw0n84" + "commit": "e2c0b952b297d99dd16f2d55f883eec8bfdfa896", + "sha256": "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298" } }, { @@ -46930,15 +47030,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20221015, - 431 + 20231030, + 2155 ], "deps": [ "git-backup", "ivy" ], - "commit": "e54a3c4b95023c58664a2c59b95a95a07759a1f8", - "sha256": "12r7nk5zxplaq5sk67003h57nc7m6z3xi50g6xnqwas8z7pczfpi" + "commit": "8c825ac2fef586e2792e980003e5ae0deb908bbc", + "sha256": "1wv0z122sn3p1rs0q62bhylna28308svniwznfix54vxsjxwz1m6" } }, { @@ -46964,14 +47064,14 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20231020, - 1845 + 20231101, + 1839 ], "deps": [ "transient" ], - "commit": "d675d2ec3f6fb10a07fc3632bb7034a74f92cf8b", - "sha256": "0c07hv3ca8pch9cxqr97m4szksk6m21ipy0a0kimqnavivcgwii5" + "commit": "d353c2882fa0bec59e6541a2171e9816244eb73d", + "sha256": "0hm1pf239clp80s4abzdnlgw3vp8qwlkglaa1qzap8932p3dlscx" }, "stable": { "version": [ @@ -47027,16 +47127,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231027, - 2058 + 20231030, + 2243 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "16ddcd7cc8eced7c242389a8ec51ce52f3b28425", - "sha256": "0c7zsya1v7hkbn316zkky4j9nzkrfavr9xspwrm40mv6z9vdan69" + "commit": "5cf664cd32010d3a5207c09da60e0c8f0c37b496", + "sha256": "198dqqbxa62dlqbf28fxxmqlbvv854l0wmi0ha8qx0vslq5pys4x" }, "stable": { "version": [ @@ -47373,26 +47473,26 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20230920, - 1224 + 20231101, + 2323 ], "deps": [ "compat" ], - "commit": "3889534bdafb04fab84c083ccfc510202926c5a0", - "sha256": "10irpnccixwf6whxhdm9r8x66npd0439y2rv18fcn8f650d6pxac" + "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf", + "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc" }, "stable": { "version": [ 1, 4, - 1 + 2 ], "deps": [ "compat" ], - "commit": "44d536ba637235c9dd203410281397417a3e60b6", - "sha256": "0b9fywqwccdvyg1cfnlzl61gq1gryjvzp32cw91l4igv7ppmq684" + "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf", + "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc" } }, { @@ -47724,16 +47824,16 @@ "repo": "akirak/github-linguist.el", "unstable": { "version": [ - 20220928, - 2013 + 20231105, + 736 ], "deps": [ "async", "map", "project" ], - "commit": "73f9f52e1f626e866d8becc7a3671630449764c2", - "sha256": "0vsab3jwkck9l42j22j2ndcj6njqbi516z7ayhlnv2z10ifjwfp7" + "commit": "7e24d62266ff0c56b63dc8ca4bf6d39a88aa1d5b", + "sha256": "18wh1713zgn2p733n9psqq51ixlxacnbsfw4h8falzahn53mk0j6" }, "stable": { "version": [ @@ -50012,7 +50112,7 @@ "version": [ 0, 33, - 0 + 1 ], "deps": [ "dash", @@ -50020,8 +50120,8 @@ "magit-popup", "s" ], - "commit": "f3c1fca929db8a8289c27533de1fdffaf72cfba3", - "sha256": "098f5rj6x6w6pdl2jz0yabrsq7gyhrncz676j5clik7sn97fp3v1" + "commit": "6de69ad0cd33a85545b15c7d201745f2fd807dd1", + "sha256": "0bmd2akj3dp6xp8rr69w183ha3wj2xz9b3pp8bzh5ifmcwwp4cg7" } }, { @@ -50047,11 +50147,11 @@ "repo": "DamienCassou/gpastel", "unstable": { "version": [ - 20181229, - 1404 + 20231030, + 713 ], - "commit": "8a5522b274f79d55d7c9a0b2aaf062526f9253c7", - "sha256": "01pnnqcxni55xr7r2lxcnsqiszm2w5iwnjcwp748p1faq6ywhi19" + "commit": "d35505abb1e38ddda61440b033ebd4decac7a25c", + "sha256": "0h4g3fjvxn7r7zikxf62znabspnkr9a1wfrs4ij20vb6pzs95lkj" }, "stable": { "version": [ @@ -50104,11 +50204,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20230502, - 2319 + 20231108, + 150 ], - "commit": "a38c152caa99ca30af86040907f70b027173c19d", - "sha256": "0am5hw32052pslhxczf6vhzm9ywjwkcdrbccbpdc3fbn78b770jl" + "commit": "fb0ab4b1e95a6ba97c09ff072fc91ac7c7f22afa", + "sha256": "0vqxf5zfsaa1ddqp80fhyyfpgpi5my1dzxpsd9zzbf7cma383r00" } }, { @@ -50175,14 +50275,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231024, - 2326 + 20231108, + 2129 ], "deps": [ "transient" ], - "commit": "644fc1de2f1934f2db1e448de1edae065e848b77", - "sha256": "1jr65afr7nk3qmc7qjb4xslaz3438j46vl4wavx8is3n41621sd3" + "commit": "0109d0d1c067aee8fc3228f1f34d766043258cc3", + "sha256": "15lwqgydkzqc4zp9dfyiqlphm14pr5f588gwi8pxw36dmpgik927" }, "stable": { "version": [ @@ -51514,11 +51614,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20231028, - 643 + 20231103, + 1440 ], - "commit": "6badf26c40463155d15d196ebb1ee8d69e6b384b", - "sha256": "0bgbb8s26ll1qmvfvkaj1cxynpxljkbr4wm4hfnvmkbby7c0356j" + "commit": "790686fd26681c9602b534075efa09a522a5847d", + "sha256": "0h2bgrqi49x4s3znyxiaxa4is5rl4cab94dysycardlhw1gn9cld" } }, { @@ -51695,15 +51795,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20230927, - 530 + 20231108, + 23 ], "deps": [ "svg-lib", "ts" ], - "commit": "cc885461c6f7cb4bb08e563f0324ebd2b415b17c", - "sha256": "18avl13wripi7nxbwbxmyg64cx2gj27kd46q4m4ycpps5nhs0fyc" + "commit": "c28a4a704f57f0e889110063edaf0f186feace0f", + "sha256": "04dwvi0mzp8c1kxyswifr65q05yfc4f0dxd6f8jnqy7n9vhmqalq" }, "stable": { "version": [ @@ -52308,16 +52408,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231027, - 1921 + 20231108, + 1729 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "4ea8631540ceed540c6242309c5778b3b976d12a", - "sha256": "0w2ynkm256sw25m8yzj5zgqjhhfa1zaqj7a47c81isjdqxfbv7v6" + "commit": "2534c228ef6699cb2588349c44627835fc444278", + "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" }, "stable": { "version": [ @@ -53118,14 +53218,14 @@ "repo": "emacs-helm/helm-comint", "unstable": { "version": [ - 20230918, - 537 + 20231102, + 2029 ], "deps": [ "helm" ], - "commit": "2998787568b67ffe9fb898a9150d13b37387707a", - "sha256": "1bw74z53s0zs3yqqgxyhlxhmg8s5wmlrskr1033lyga05wbzblsq" + "commit": "9215b2aa8f42f62cbda66a1503832abb7f491549", + "sha256": "029dhxy73lhpbpsw7n3sj8z18c2syy59551pfd31k8kas98ck52j" } }, { @@ -53169,28 +53269,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20190812, - 1429 + 20231108, + 612 ], "deps": [ "company", "helm" ], - "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", - "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" + "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", + "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" }, "stable": { "version": [ 0, 2, - 5 + 7 ], "deps": [ "company", "helm" ], - "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", - "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" + "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", + "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" } }, { @@ -53201,14 +53301,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231022, - 1046 + 20231108, + 1729 ], "deps": [ "async" ], - "commit": "a4380caef3a9e4b1e8d11458852ab67ba9b4cf58", - "sha256": "1q6v5zf5wfvg6krj8xfc4g33ja68r8abw5ymy3cmbyvnmxj9dwyb" + "commit": "2534c228ef6699cb2588349c44627835fc444278", + "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" }, "stable": { "version": [ @@ -58470,11 +58570,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20230824, - 1457 + 20231108, + 1101 ], - "commit": "3076cb250d0cb7ac6c3ec746dc4ccfea09ccdb25", - "sha256": "0hc13big8cnqf19cjcdwq9k1plpc9401hf2ddxf4vd0gyqlxlsxn" + "commit": "a7563c9d08ae23abc05f8a184911ff803e52a54b", + "sha256": "052yjj75fwic6n32qc5cyaq73vag7y6c68qk6868y526wwp3lxlj" } }, { @@ -59209,18 +59309,19 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231027, - 1458 + 20231108, + 2105 ], "deps": [ "compat", "map", "persist", "plz", + "taxy-magit-section", "transient" ], - "commit": "f37b757087a882d1736af3f06374bf81da940f06", - "sha256": "0l7gbqa8q5vkw2ydqgl5indf806shhi37pd2ihcr15g3az7indw3" + "commit": "0bb8c90827781241b7c04904e7a348133e084453", + "sha256": "1y8c8dpzj4fvym2sk3ci0sdrkm70w9anyvgpb6q2sa5b25hwgm7f" }, "stable": { "version": [ @@ -60322,28 +60423,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20231021, - 1749 + 20231110, + 851 ], "deps": [ "ghub", "transient" ], - "commit": "a47d3da93e9f8be3d3fb45cd939ef727203411eb", - "sha256": "1z8xbw40zrmplgfpk4znafq61f00pjbjrsgjcb84fvg3c465jx0i" + "commit": "92e3c429c0da07025624cceb5796ac41edf753e2", + "sha256": "10hw58zln8x8kjyzmfl1vfqj5mqascix9c7rdq884f8ypfynx7p1" }, "stable": { "version": [ 1, 5, - 0 + 1 ], "deps": [ "ghub", "transient" ], - "commit": "a47d3da93e9f8be3d3fb45cd939ef727203411eb", - "sha256": "1z8xbw40zrmplgfpk4znafq61f00pjbjrsgjcb84fvg3c465jx0i" + "commit": "e588d2f625ad5f780572e144145e789a764af1b0", + "sha256": "0vz8xzdl87wvkvlawr0ph9s20r263qks9kp5b7g2hv2zng6wr3x5" } }, { @@ -60948,11 +61049,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20231015, - 616 + 20231031, + 116 ], - "commit": "5d83d5fb581db8eaeb7f200ddc53c15a9b9a8b62", - "sha256": "0vsfqycwrwyq0dwmhylgwnsr53ak1h9ix901ygdpamx6lr7ljm4n" + "commit": "944030cf4137caaf5356519aaf44159073bad50e", + "sha256": "0mliv9p3ywyz877qa3r7cws18mkr9n68j9v9ivhg53b6zl15yrkd" }, "stable": { "version": [ @@ -62334,14 +62435,14 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20230517, - 2157 + 20231104, + 855 ], "deps": [ "f" ], - "commit": "b341ae06f5895d0666ad361f287036b1dfd7b3b7", - "sha256": "0xyysm8qr86rjxpms33wfbx607ks4wj53bpy6md9ldk5wfjbl0i1" + "commit": "b5d5d6ddbc5f636d9c1d2fb68a7950b1b3738074", + "sha256": "04iq210llgzw5hds3926dc9xbi8f4igj7r4pxj6gwgyriyg5sjaf" }, "stable": { "version": [ @@ -64311,14 +64412,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20231019, - 1708 + 20231104, + 1427 ], "deps": [ "compat" ], - "commit": "884379eeea2cd5329788a3948418133ad762ed31", - "sha256": "1n6z49gxmn3ga34m62n3npjmhrzbjfrmbm4rhmv87mqq8gibk4ig" + "commit": "6f6108896744d1da4887b08e4fe4fff403ac10ac", + "sha256": "0jf9p75r13p28n1kv9w85kk9n3nfp4d8p34y76n3rqhh3sib2asg" }, "stable": { "version": [ @@ -64460,11 +64561,11 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20221119, - 1653 + 20231110, + 1253 ], - "commit": "baaffdfd22a19afb1997ec3715d063186b80d3f5", - "sha256": "0kjzgz8kzvyh7kqjcd9r2cfrhldv90v3yjkpd41vnzbb29b46d4h" + "commit": "cb3185081cc8eba06de30936efa227639fb8a60c", + "sha256": "0805nvz7kssjm3gahm9g8s25by44dm16anz69087jqfkdwxly023" }, "stable": { "version": [ @@ -66010,6 +66111,24 @@ } }, { + "ename": "kanagawa-theme", + "commit": "7f48763ca253881f454a999c6bebe12325066e59", + "sha256": "046va3ik8h19lm7s3308i1379d35i3jzjw9p05ml85srfxmpmchr", + "fetcher": "github", + "repo": "Meritamen/kanagawa-theme", + "unstable": { + "version": [ + 20231023, + 114 + ], + "deps": [ + "autothemer" + ], + "commit": "08debfc56e052ed69c7ecc3b08c687bb5af4a33c", + "sha256": "1mf4w05zhmhdrknfnpfrcvc3126i3vqcsyjwp0n83km1d8wcd1sx" + } + }, + { "ename": "kanban", "commit": "c5c918900ad97075d788b3de658cddbb0c94f5d0", "sha256": "04sy524zz5y99pb1nvlvqf9qyk57mrlmjqbjy44crl34ypi8gik6", @@ -66211,11 +66330,11 @@ "repo": "carldotac/kdeconnect.el", "unstable": { "version": [ - 20210519, - 2016 + 20231029, + 2250 ], - "commit": "4977af8cb5fdc21da770f3ee43ad7823f2937da3", - "sha256": "16615kvyg3azla1niiz5d2zdlj4mv5kpyscna7w7r1jkzbysc2zd" + "commit": "2548bae3b79df23d3fb765391399410e2b935eb9", + "sha256": "1qfy9hav2gzp4p1ahf0lvxig047wk9z9jnnka198w8ii78il1r8l" } }, { @@ -66481,14 +66600,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20231027, - 2204 + 20231105, + 1206 ], "deps": [ "compat" ], - "commit": "0a1cd94dfe047e60912791439e03caed0fdcaa0b", - "sha256": "13m07ik30li3jm9sa5js61i6kvjdhvqdy1yzj94i4qrr7mm67zk5" + "commit": "6a6f9106270f65b0bae3afb2ccdc52a3b5fbe340", + "sha256": "0n7pxrd7n56500xnn3w9m9c73zqaan1v9cqbcyd7nrhyb4dnbc10" }, "stable": { "version": [ @@ -66558,14 +66677,14 @@ "repo": "dacap/keyfreq", "unstable": { "version": [ - 20220607, - 1613 + 20231107, + 106 ], "deps": [ "cl-lib" ], - "commit": "dd88193cd7a91a92113121191573758ea2a3ceb1", - "sha256": "1rld3pwrdpgvpbn1pfwa71bb0kapv5a0ny0dh7ck2g07k1wql7lh" + "commit": "c6955162307f37c2ac631d9daf118781009f8dda", + "sha256": "18iw0jwr9hmxv5vikqf28sknml0k14rvddp80s2cm6bglaz4sdc3" }, "stable": { "version": [ @@ -66830,28 +66949,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20231018, - 1043 + 20231110, + 828 ], "deps": [ "dash", "transient" ], - "commit": "8346e1193cf31ce8d66de7793b958bdd06c9d2b9", - "sha256": "106hvr7awd4mnfr7pjlpf0np749mmaffhyfg8di70chq0rmf142z" + "commit": "39ad1c6ce6c70c22c5d7a3a686a289ef0465a675", + "sha256": "17qyv28apbwa2id4mhmdwji2bmcpq8r1fnbd9q8dmqxzblbxhx85" }, "stable": { "version": [ 0, - 13, + 14, 0 ], "deps": [ "dash", "transient" ], - "commit": "8346e1193cf31ce8d66de7793b958bdd06c9d2b9", - "sha256": "106hvr7awd4mnfr7pjlpf0np749mmaffhyfg8di70chq0rmf142z" + "commit": "39ad1c6ce6c70c22c5d7a3a686a289ef0465a675", + "sha256": "17qyv28apbwa2id4mhmdwji2bmcpq8r1fnbd9q8dmqxzblbxhx85" } }, { @@ -67287,11 +67406,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231026, - 958 + 20231110, + 1334 ], - "commit": "0472c9346e30f8499c87938a323c733628a0dd26", - "sha256": "1gnlrbzj1z4028mm2c6bn7bf38vbs90z88i63f428hvjvimg0pw1" + "commit": "b9ccc4896c8af8e8b60a26eb16fffe8a185551d0", + "sha256": "1dy1j72i8ymxlvhrbh3k94l90p3vwfn8bimbrlw100aqz41nz2jd" } }, { @@ -67716,16 +67835,17 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20230819, - 1456 + 20231106, + 1250 ], "deps": [ + "f", "memoize", "request", "s" ], - "commit": "44cc2630adaa02f902bcf28fa05f3a9039dda005", - "sha256": "1s027dmf2awd8qyrg33zr3slbwkpc00c586cld5kp5ky5gawaxsv" + "commit": "c79bf975ad799e11ead0e2f2ca909222044b35cd", + "sha256": "1n9xnpz6yv7rczl0cjk7qd5962swcf19022hpaf46kva2sw43333" } }, { @@ -69031,20 +69151,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20230812, - 1827 + 20231108, + 1108 ], - "commit": "b73a51a71ab8424bc2da8891f28e5239eac1236c", - "sha256": "159y2l4qj5gk1c9676mm5nrmpdljb4jm6sc933gq6q4p34wvrmgc" + "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", + "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" }, "stable": { "version": [ 1, 1, - 7 + 8 ], - "commit": "b73a51a71ab8424bc2da8891f28e5239eac1236c", - "sha256": "159y2l4qj5gk1c9676mm5nrmpdljb4jm6sc933gq6q4p34wvrmgc" + "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", + "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" } }, { @@ -69442,16 +69562,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20231028, - 359 + 20231030, + 406 ], "deps": [ "fringe-helper", "ht", "ov" ], - "commit": "9e60c92b2495737d25407d79fb3a0e3d9909d5c9", - "sha256": "128icdyrfcj9p6yg98bpgmm72qi71hb51bv042549qwgdfbx7is6" + "commit": "1835ea7dbd4943a165c9786d19cebaceff170a71", + "sha256": "1606s3ql0wchi6svv4g688nb562n0s4vlxsaspmp78lx51h93955" }, "stable": { "version": [ @@ -70986,16 +71106,16 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20231023, - 219 + 20231110, + 238 ], "deps": [ "compat", "map", "seq" ], - "commit": "3819e0f74dbde83822fb1d5d26444c3a5c63f408", - "sha256": "0w1gffzg2rjimwfwz6wrgskadjsd8cz7hnaqy6da022mskifzh1n" + "commit": "5af0db0c9235387baa1917359d8b1583732adda8", + "sha256": "18abpmbc90vzp3jwz4jw07yliiipii3l0i47wdwalplfpr6cafxj" }, "stable": { "version": [ @@ -71126,8 +71246,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20230516, - 52 + 20231028, + 2340 ], "deps": [ "dap-mode", @@ -71139,8 +71259,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "5356af174813ccad4f59006acd918d7303b3af0a", - "sha256": "1jxlgmn9sqwcr0czkf68vr9yhj6in4n6gl4468dbh7gkhyvsd28z" + "commit": "78ab137e05c4c2be406a121407c8e71e11ee3339", + "sha256": "0vc2dj9lag770bbz8h45rz9h38qyvkzq2mn7ijkqiyfa35nyw3kj" }, "stable": { "version": [ @@ -71458,15 +71578,15 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20230717, - 1707 + 20231104, + 313 ], "deps": [ "consult", "lsp-mode" ], - "commit": "7d70e07a02f7b808ba97f1ed7d63491ab8f55900", - "sha256": "0zkg2jj4a8ra104k05yz54njzajz8qhsk93xn7yln76133pmhhn6" + "commit": "9a59f2634163ea8a0033adf482b57c67c68629d9", + "sha256": "0jdwar9x2dlv9ldlshfj0m0n2bmiz7g9c6xqx3izgi132qh3f4lb" }, "stable": { "version": [ @@ -71567,8 +71687,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231027, - 613 + 20231110, + 716 ], "deps": [ "dash", @@ -71579,8 +71699,8 @@ "markdown-mode", "spinner" ], - "commit": "0f5723f9ae5d7fe2a82ad45e4505710b6a13be41", - "sha256": "0zxsvz73whc44xgsvcfikdbb5d5f762r7ys6zpik07n7ry98qq85" + "commit": "3c1c583b549d81ab8e23ddd58b0a7f065e6b6f2a", + "sha256": "0di1hg5hxm6ybqz063yjj6b9rpjaxgqgia6k753hyp9p95c0619y" }, "stable": { "version": [ @@ -72320,14 +72440,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20230814, - 1525 + 20231104, + 139 ], "deps": [ "transient" ], - "commit": "0a99de715b1f62a01d8128dfaef263a168ee05e4", - "sha256": "1nh92wm6w0a1jl7j5kabwqi56q86j66577z9252kv61cdzy74lb5" + "commit": "e70bdc860a047cdd22f0b6f3edea06adc94d0d7f", + "sha256": "0izgvmz5xz65s6g7zpllma03hjcgzwc7icbcvfljvsn8mk01zp8b" } }, { @@ -72518,8 +72638,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231027, - 1202 + 20231109, + 935 ], "deps": [ "compat", @@ -72530,8 +72650,8 @@ "transient", "with-editor" ], - "commit": "2ca552e3c4c0086f1097c2c7098888425ec6bdee", - "sha256": "0fpifvbnddx61y88ndr3sdx69knj50hvqd5bcapa8r1r3dic64dg" + "commit": "02630b51896929011a420d9382779c98ecaef687", + "sha256": "06cnhwzxjpqb29km9nxjynapxiajaa87s7q32c4igq4yjp3jy0h0" }, "stable": { "version": [ @@ -73695,11 +73815,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20230805, - 739 + 20231102, + 1929 ], - "commit": "8f3d6497aca7b0e6a8dc759b307d20fcb68920d9", - "sha256": "0az2w80iiza3s2f4qr10rkd70dgj86vklfv35ibvm4g1fxw4i5bz" + "commit": "b173b41743d3e9668df2ec59df0378d8295d9902", + "sha256": "1fg86pl4v023rpaaapgzbg2gskc6vp2ha2rkgbmq9c2f5ca9y7sl" } }, { @@ -74305,28 +74425,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20231016, - 946 + 20231030, + 1922 ], "deps": [ "persist", "request" ], - "commit": "cd2d6f23b4f7af63df3000f2fb68227c22bc8dee", - "sha256": "1b2rhb18md2n2xg2d5ikl95m4h78x8l566970r5xc2y5p199b6hi" + "commit": "a8c80d25b7790746a439ae6c2deea3dc6bcac710", + "sha256": "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2" }, "stable": { "version": [ 1, 0, - 12 + 13 ], "deps": [ "persist", "request" ], - "commit": "cd2d6f23b4f7af63df3000f2fb68227c22bc8dee", - "sha256": "1b2rhb18md2n2xg2d5ikl95m4h78x8l566970r5xc2y5p199b6hi" + "commit": "a8c80d25b7790746a439ae6c2deea3dc6bcac710", + "sha256": "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2" } }, { @@ -75068,11 +75188,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20230920, - 824 + 20231108, + 1124 ], - "commit": "a74d0d11f400e679bfdb48e714da2b595ebb268b", - "sha256": "17dnmq9g7wn5jkxypzk52vbz2bzkg3yfm517mg05wq7qc14dnbjl" + "commit": "f46ebad2216460cf58293b913bb76c5e9bdc968c", + "sha256": "1wirkcwi21s8z3210h9fwqbman2fg2366b05vgmgasphirsjdsw0" }, "stable": { "version": [ @@ -75804,6 +75924,30 @@ } }, { + "ename": "mini-echo", + "commit": "327f330c9d7f07aa32a31ab45512e503947ca609", + "sha256": "1d2l37w6hbflm6243c6iqgz4ci2p45ssh1kq1x8llpwq6s22r090", + "fetcher": "github", + "repo": "liuyinz/mini-echo.el", + "unstable": { + "version": [ + 20231107, + 1317 + ], + "commit": "9d89e352b73ff2222d62b43b8944206582723fef", + "sha256": "14gr1fc1bdwwzll1yq2sc5yaadvb4360lqypvq805bnnhdjqb6hb" + }, + "stable": { + "version": [ + 0, + 5, + 3 + ], + "commit": "89061feace09249a93e8bdaf2474cc953eee604b", + "sha256": "143i9ih18mh26mdq9d9pxnb468n9zmz2xxs49hgzkpyhc5hdcdy9" + } + }, + { "ename": "mini-frame", "commit": "2a10ea61ac4a3c8fa800f4107f256fa3ac5907f2", "sha256": "06zv8qmbvzqzinmb5zcd40a43kmmq7mby6dgacpq81cg5azyfkr7", @@ -76178,11 +76322,11 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20231016, - 1730 + 20231106, + 1627 ], - "commit": "2524edeff25ec4d51fbef1ac005a0b6a92a10b56", - "sha256": "07ixq2fgsjik0iyv6hizrci8jcr7zlyfghxpfs6agpb6appvdn7m" + "commit": "7f9d259db5e50bbb13876b5927ee78b3d7d127ea", + "sha256": "1zgw59cpnhnb7jxck2bdkb27fzh60l3cl2g4zx86xzm8nv2zrv09" }, "stable": { "version": [ @@ -76201,11 +76345,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20210605, - 1015 + 20231106, + 1926 ], - "commit": "3d5dbc0ef01c4f6b3732f067e9ebc2d7be74a49e", - "sha256": "1530cf0wd04vxqx6kxxpgf0267342s1rcqkc7i6l6qplvnxwxm1w" + "commit": "811ff399f43425fc6e04866a521063d53938b6a2", + "sha256": "0lxacg1m8fq5qkdbp55zmhaxq9wwvhgdw4nax997l6nnb7ys0q8d" } }, { @@ -76500,20 +76644,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20231026, - 247 + 20231028, + 1648 ], - "commit": "0a8471752f89d07b439680212dceda2e69b63457", - "sha256": "0sgxsknrq65hijrlvzd14j78vfd6wfah7qg57rcbjxw00hs9nxf3" + "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", + "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" }, "stable": { "version": [ 0, 8, - 0 + 1 ], - "commit": "0a8471752f89d07b439680212dceda2e69b63457", - "sha256": "0sgxsknrq65hijrlvzd14j78vfd6wfah7qg57rcbjxw00hs9nxf3" + "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", + "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" } }, { @@ -76775,11 +76919,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230926, - 1524 + 20231031, + 716 ], - "commit": "284433625ed7cd3b19d2e34589c3041e16dd0deb", - "sha256": "1mmrgl8apqd6zjqxh7hrbnwjp2xg6xa4q8b3zxwnscqhz21abrvj" + "commit": "ff70fd4136df589945d06de6926286d70243345b", + "sha256": "16qr26ihf50w536r6646csd2vxl6xgyyzywn095cxs8mq2qp7jzq" }, "stable": { "version": [ @@ -77508,21 +77652,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20230807, - 1644 + 20231026, + 1200 ], - "commit": "9a925ee918e4b9c0266fb61b5cb2735f21ee6f1a", - "sha256": "1lfkn09jrw50slzd127vwypflhyd1sjl38sd98k3nksnkdp4kski" + "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", + "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" }, "stable": { "version": [ 2, 29, - 5160, + 5268, 102 ], - "commit": "f14a3f49cb56adb4386cb264133a01b32929dfb7", - "sha256": "1mwrb6y813zwln5y39n4m7l80hr5z4qrlvvmm29ng16rngv0qfpc" + "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", + "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" } }, { @@ -79671,11 +79815,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20230925, - 235 + 20231105, + 653 ], - "commit": "0262a8c4fa41541438e489572bba8f0b4b689ae7", - "sha256": "1c7pf6fp99y3gsn8pb73h1gwlz3ag2i0h5i8pl7i0f09p3ra9jr3" + "commit": "a506b43dc241ee07c28ce815068277084afbf09c", + "sha256": "0jahmqvi0hb8jsraj21d1n6wdp827yak2f4bs9ljpmggqvxp40pl" }, "stable": { "version": [ @@ -80231,8 +80375,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20231013, - 1142 + 20231101, + 1342 ], "deps": [ "commenter", @@ -80240,8 +80384,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "2cdbdf10d504d8ff4db7a655276e3c554043ac14", - "sha256": "1sibj1xy7hy5pyqbs71wnk1ysdzbwm12fjfkjlylx28f4f0grh3l" + "commit": "1338e5b0d5e111ad932efb77d3cad680cc3b86c9", + "sha256": "1c7nx730c7fbdkjnb3ym9k3bfxjgfs3ki69ld0qam2jf5xjhl398" }, "stable": { "version": [ @@ -80459,11 +80603,11 @@ "repo": "remi-gelinas/nix-ts-mode", "unstable": { "version": [ - 20230821, - 1334 + 20231107, + 1639 ], - "commit": "670023ec3d4e2f667a387a27990b4879e06ef60b", - "sha256": "0rwimbq6mp3z2xhhp535ysq44rcljc8swvaxsgfr5zvidpl2xh43" + "commit": "2dddc6e9ca33be211675afca3896fd661fc38a0c", + "sha256": "1a7l7r44v1ysz63k6dzn8sqbn90yaqp36crjzl3q56j8lx5f8rih" }, "stable": { "version": [ @@ -81345,15 +81489,15 @@ "version": [ 0, 2, - 0 + 1 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "3eeabdd9c922836d24433786265ef7c25fb599b2", - "sha256": "00b0x34gzcjfdpni8xfy8a51w66gb869888k44jjm6pm7c5c6z64" + "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d", + "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3" } }, { @@ -82089,14 +82233,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230708, - 1957 + 20231109, + 914 ], "deps": [ "chatgpt-shell" ], - "commit": "345f9d0e9047091474a2cea3d12b6e52b804ae36", - "sha256": "1izsmc5h3na3wz7vgppid3l65y8xm8wcr9rskmxg8pdcbi7q3qb5" + "commit": "58bb4d8eb9218be4925201a39596387d160f4593", + "sha256": "1mqwc2wkz2ax4pzi76vqq59v4qjwp221sw4nw91nr6zbk5ws1780" } }, { @@ -82250,14 +82394,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230708, - 1957 + 20231109, + 913 ], "deps": [ "dall-e-shell" ], - "commit": "345f9d0e9047091474a2cea3d12b6e52b804ae36", - "sha256": "1izsmc5h3na3wz7vgppid3l65y8xm8wcr9rskmxg8pdcbi7q3qb5" + "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", + "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" } }, { @@ -83473,8 +83617,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20231010, - 1715 + 20231105, + 1800 ], "deps": [ "dash", @@ -83484,24 +83628,25 @@ "s", "yaml" ], - "commit": "d02c3e78ac8b7ef711658f8ce282d6afe4b3fc1a", - "sha256": "0zb7pmw2kp1283zkxj7gxy30n2qrdxcav7xdpw8ccbxkczsk8hq9" + "commit": "f83c5d32eba8237dedeec66c44f464019840b264", + "sha256": "1fpqc5xwqdqg4l4aifqvsr5p00997z5xdvnlnrrc1p981ifxa67c" }, "stable": { "version": [ 1, - 3, - 5 + 4, + 0 ], "deps": [ "dash", "elgrep", + "f", "markdown-mode", "s", "yaml" ], - "commit": "53413f651fced9318777db9b9c8eccfce38c2c1f", - "sha256": "0nc7x5zahamp3910xigqsrpj81gwlihkbvgy33vpawnhkawxrjdm" + "commit": "f83c5d32eba8237dedeec66c44f464019840b264", + "sha256": "1fpqc5xwqdqg4l4aifqvsr5p00997z5xdvnlnrrc1p981ifxa67c" } }, { @@ -83933,20 +84078,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20230929, - 428 + 20231104, + 538 ], - "commit": "8404b53a24393a7edcf3a295b958ca85971edc13", - "sha256": "0ywbx0wwrqxm6p6yfw7hiqdx4hshw2kgb317wmsnn5369bmn1xfn" + "commit": "1f8b3d5cb155f7497083001037a09a972befab21", + "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1" }, "stable": { "version": [ 2, 0, - 4 + 5 ], - "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", - "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" + "commit": "1f8b3d5cb155f7497083001037a09a972befab21", + "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1" } }, { @@ -84601,11 +84746,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20231025, - 2044 + 20231110, + 1448 ], - "commit": "89eb3775daa53cfb52ad03015410c23f28c72d30", - "sha256": "0gpnfxh8kps0szd5lmpy4zvqxgzmazspgg5wfdd0c1ywszz5lczh" + "commit": "b24748093b00b37c3a572c4909f61c08fa27504f", + "sha256": "155ciczwvn7xs3zdaf43q8bryvhd9lsbr85vvj8gs85zjqb407y4" }, "stable": { "version": [ @@ -84736,15 +84881,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20230520, - 1449 + 20231104, + 1236 ], "deps": [ "alert", "org" ], - "commit": "87abaeac60e37fda530787988e00307a1f72fedb", - "sha256": "0svvzlp79hgm0cgzbkyfs42j8vjnlzv76ny1y6lhamnh7clr9p9i" + "commit": "c4bcea435b96db470ac2c173a378354714429739", + "sha256": "0jvf1dv8z8fl4y4hrv5afgn5s974pyw5swvxf4k3ha2aaarhpn80" }, "stable": { "version": [ @@ -86647,15 +86792,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230929, - 546 + 20231030, + 1400 ], "deps": [ "fb2-reader", "nerd-icons" ], - "commit": "23b7b6662e5abcc164e3f3bf1f1faa2fee1b4a08", - "sha256": "04f24w06ssm9cc6zwi1ibww8nm98v0rj7a3iy4r87x64zlj8gsk4" + "commit": "670bd54601cdcc129016bbbe6334f3277e88590b", + "sha256": "1lgys9d8qvw7jry50qfh1xq5znp23n8yi1rz6w7zq57b40na1rck" } }, { @@ -87121,15 +87266,15 @@ "repo": "org-noter/org-noter", "unstable": { "version": [ - 20230910, - 1909 + 20231104, + 2212 ], "deps": [ "cl-lib", "org" ], - "commit": "ab838691f0d6ae281597451de311f71a50ba8da6", - "sha256": "1ild4764k4i92lwj1ar4j8b37py50fyav9mmgglf5csrm1k1r27b" + "commit": "a4296d8338d46b5c863d3d339b50e201172f218c", + "sha256": "1y1qsl6444jxqcs0c3aigr9qk6m3a8kjynmn31zk64nlgnybsndc" } }, { @@ -87620,8 +87765,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20231025, - 830 + 20231106, + 2230 ], "deps": [ "dash", @@ -87635,8 +87780,8 @@ "transient", "ts" ], - "commit": "bd2dd12a417df5403954576756d9c24273d94379", - "sha256": "1rmf5jg1jgfhyaarfmrmha7vhzc3v45zqccn44sihrhxpp1b8www" + "commit": "4f62ba3bd6d639b021ee9f159357b2a80d7a2f92", + "sha256": "1b4qq5y296v7kx458pj4f1ikx1a6xsg6zndnrjzjbdmkgazpaz5m" }, "stable": { "version": [ @@ -87930,8 +88075,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20231027, - 1224 + 20231101, + 2355 ], "deps": [ "avy", @@ -87946,8 +88091,8 @@ "parsebib", "s" ], - "commit": "1773de623017e177e79b17ed6a5ee6f7162fd9e5", - "sha256": "0c2p68nhxf8abpnp28zskpqnnp13x5vb47pdzymad4zjc4zrdf3y" + "commit": "195b8d3209aff956ecdd755422700e8517a34d11", + "sha256": "1bd6g33brn77x67iad02ncjh841q8lcfhqgynapvfxwf1k24c1y4" }, "stable": { "version": [ @@ -88163,8 +88308,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20231010, - 2223 + 20231105, + 2028 ], "deps": [ "magit-section", @@ -88173,8 +88318,8 @@ "s", "transient" ], - "commit": "eab43b342ee1e63e07e5d6bee5efa8180747f975", - "sha256": "10qc4aldqmg1w0pq0w3w3jw73lrlxrjva0sz3dldywnmvmgwwj8q" + "commit": "6c8b03638fd9f423104093fb2e4128435528a72e", + "sha256": "120jin5lzjg0mcj9bp197hxhwy2ghycsk00zlax1ymi3pmlcrsmy" }, "stable": { "version": [ @@ -88848,14 +88993,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20230721, - 203 + 20231106, + 43 ], "deps": [ "nerd-icons" ], - "commit": "4805dd105eca312c8ef6033bd57d356b37063ace", - "sha256": "1acjsnvj47gf1rnm5xzck7h817p9zipi0xqywcr10v15mqwk6p8b" + "commit": "81bcb84e39587d99b3946e9b32f962975787f49e", + "sha256": "0wnd4qyfibcjf5m7gq54jskfij2b77z4qzvl98pkbdy9gxlqgwbi" } }, { @@ -89027,8 +89172,8 @@ "repo": "ichernyshovvv/org-timeblock", "unstable": { "version": [ - 20231010, - 832 + 20231109, + 843 ], "deps": [ "compat", @@ -89037,8 +89182,8 @@ "persist", "svg" ], - "commit": "0c7bd445800569a87eff5284ceef1ebcf13f281b", - "sha256": "11nwxvc10pbf0ykhjnrz2vivsyp7i4x1zp1k8y0xyr784lrngl8j" + "commit": "7ac198c48646f864f18aef1c7e55c15ab8d8b679", + "sha256": "0m6gzjzv4criydhsz2s3q1kqc3bs11zg5svgjaksb7piks9368ds" }, "stable": { "version": [ @@ -89469,34 +89614,36 @@ "repo": "alphapapa/org-web-tools", "unstable": { "version": [ - 20230904, - 107 + 20231029, + 453 ], "deps": [ + "compat", "dash", "esxml", "org", + "plz", "request", "s" ], - "commit": "d5bdeb7a772082885a77e98279ad63307977cef7", - "sha256": "1pyl4h57aqbv61r2vnc2bm06dx2kxpv4kqxi6pwzxd2pqfg7l8xp" + "commit": "821e6f032f5823e5e3344ea4d1a36870e236aba1", + "sha256": "19q79mjlx0iawnlh2imvs0cnqgkj90am1yclnbmvll1cjz0rzdx4" }, "stable": { "version": [ 1, - 1, - 1 + 2 ], "deps": [ + "compat", "dash", "esxml", "org", "request", "s" ], - "commit": "ca87319cd42eaa2eb02213e81dec19b7bd2918f7", - "sha256": "0v4qad54r0z7dr7kg5lpfdsazi44qvrbybx9aciyl4w9grfajphb" + "commit": "067e6a2dc972f6ffb757c7fd204cd1dcb604edf7", + "sha256": "1w24d1cxzgjqycqz894kg3707n3ckwpv5cmbywfaffsz1v5i2p3a" } }, { @@ -92038,27 +92185,29 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20230905, - 629 + 20231110, + 1025 ], "deps": [ "cl-lib", + "compat", "let-alist" ], - "commit": "b9e4c2a7ccea4228899dce115ac10bb6800fd41b", - "sha256": "1yi0lmnkp3069ng5cxxsk8p0g3653qm7rf74v6wibf6i1n46b3mh" + "commit": "c541e67dbb7f93b888edac908e9b25813ee7e6f7", + "sha256": "0y3qq1hn43xkmv3x807ja088s75hs06lj8fgxa7a16ifaaa0958c" }, "stable": { "version": [ 0, - 19 + 20 ], "deps": [ "cl-lib", + "compat", "let-alist" ], - "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", - "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" + "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", + "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" } }, { @@ -92069,25 +92218,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20230806, - 1331 + 20231103, + 1810 ], "deps": [ "package-lint" ], - "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", - "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" + "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", + "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" }, "stable": { "version": [ 0, - 19 + 20 ], "deps": [ "package-lint" ], - "commit": "91d0f1077c78753e09973d63fb3e571413a4c206", - "sha256": "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z" + "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", + "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" } }, { @@ -92475,15 +92624,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20230416, - 952 + 20231103, + 5 ], "deps": [ "dash", "hydra" ], - "commit": "da3f0f5238a8b1e5f09f2ec97e683dc488d25be0", - "sha256": "0azplwy3r29pczgdh4jvwxwr7qvbpsja2748qy4k8i0nj7h26i1v" + "commit": "340da8787d6305640d042af46d2bd609bd5a7518", + "sha256": "1m3p6c1vjkdfpr1rjpb6rxxjrf9maa204fxpmjqnmn8mw7bfw944" }, "stable": { "version": [ @@ -94201,6 +94350,24 @@ } }, { + "ename": "perspective-project-bridge", + "commit": "01dbaa3027de1a457ba4229f5a6cb8b87ad25c45", + "sha256": "0x2hrm3w01m0mi769y0qdhfnm948pvafzw26mq30zb933dz6v7h7", + "fetcher": "github", + "repo": "arunkmv/perspective-project-bridge", + "unstable": { + "version": [ + 20231024, + 1737 + ], + "deps": [ + "perspective" + ], + "commit": "7b65b08a0151b8279fc3ae75f0016cb8d5eadb53", + "sha256": "1j7j82b4d2hyrmaxmnkp53ps8jp4p4b9x7qa70psyjhrnmn7pfch" + } + }, + { "ename": "perspeen", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04", @@ -98836,19 +99003,19 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20230506, - 330 + 20231101, + 2003 ], - "commit": "0d3b0c61f4f44c3d8770b89edffe481aaf56f4f1", - "sha256": "06xl81cm55g0dcpfh8b8za8mrs5cgjv656z23q5q0ph3war6ifbn" + "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", + "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" }, "stable": { "version": [ - 24, - 4 + 25, + 0 ], - "commit": "7789b3ac85248ad75631a1919071fa268e466210", - "sha256": "0ss3man0b959rxvbd6hbndg2bsk69kzpsm8rzngyzcwfh6myvr93" + "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", + "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" } }, { @@ -99015,15 +99182,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20231023, - 1749 + 20231107, + 735 ], "deps": [ "async", "cl-lib" ], - "commit": "1f74eecb5375fa94eb8d809f8e27caa48ed2323d", - "sha256": "1aa5g9082s8dvd0hd1n4yjlcnpd64l1przmmvjr4vgyaix42rg9z" + "commit": "76101f8a5afe705e4a815ab51b87aff03a64cb91", + "sha256": "1ylcqf882n2mzixs5r7r4fzyngic6spff9yc8mz5rvg4l4633qdl" }, "stable": { "version": [ @@ -100404,8 +100571,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20221021, - 1937 + 20231106, + 1557 ], "deps": [ "dash", @@ -100413,8 +100580,8 @@ "s", "transient" ], - "commit": "33c921adaa6c9c8f7cceba2342114c6b406e0d7c", - "sha256": "00bnqya530fsdwzqxz7d15xqnv6axip1i6ny9zb1yahkzkc8zbvi" + "commit": "7e8acc0232355db35dc66a15bf50c14a80ba3e72", + "sha256": "0gl210nm1n5ynpirzn1h81zb4x0q6nl8biq2132chm3l5m58fapk" }, "stable": { "version": [ @@ -101107,11 +101274,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20230919, - 1539 + 20231110, + 1508 ], - "commit": "b5162323d0ba590c368b1c67039bb3ee44cfcaaf", - "sha256": "03l2ha1wlqazml672gn7vdph0grrb8ncz0sqf1zlvmbw6yg1k1al" + "commit": "24d59b1546d963c2b92f67a8efde951db90182da", + "sha256": "10s29phk21scdgyyl8ya7l23xr07gm5li7kyni25hh91q6fkldaa" } }, { @@ -102141,20 +102308,20 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220527, - 2122 + 20231104, + 2100 ], - "commit": "a8ec93656698c5c02a02279ee7d7976325cc74cd", - "sha256": "075x71llqa8g4a872m57vij49bsxiv42yr0sbrwcxjm6dp6q08wa" + "commit": "c78a06b0d10c08ec4090ba61b964022e54415aa5", + "sha256": "0kn41lbihrmwjbly3kk7fn47ig80vnciw6kf7pidsqcxagcvwj0y" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "5a69cc206c8719bde897394376555bb74e77b915", - "sha256": "0c0a0mvhs0cx2lq3rkimxagyc33gn8ha1vb3p3py6h466lmyqbh4" + "commit": "c78a06b0d10c08ec4090ba61b964022e54415aa5", + "sha256": "0kn41lbihrmwjbly3kk7fn47ig80vnciw6kf7pidsqcxagcvwj0y" } }, { @@ -103961,8 +104128,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20231025, - 1220 + 20231108, + 959 ], "deps": [ "cl-lib", @@ -103970,8 +104137,8 @@ "popup", "posframe" ], - "commit": "0de3250fd1005878dd7a06a8fef7324a878f17b3", - "sha256": "0yfv3pw82953l77lz1jj5pscjra1ha157pzlhhykmn3sfvn0s45r" + "commit": "fd434071ce95c41e5d580e303ccf2a65f189e7ec", + "sha256": "1kzksqz71jnqn10841fasyydj0bqfs9hjd0yvpj7wk0knhjz2g11" }, "stable": { "version": [ @@ -106691,15 +106858,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20230814, - 844 + 20231102, + 1035 ], "deps": [ "apel", "flim" ], - "commit": "d15603b8eb791f2057b48071c262996ad7767505", - "sha256": "0cxrzgxflwgz9wsim84vrliwvkf53v242di4dvn2dfh65gccwqjx" + "commit": "9063a4485b148a767ea924f0e7cc78d3524ba256", + "sha256": "18km8jdxjcqnh378xxd7ivvvcxzrif8zpq9zgki9i7f0q8lsx677" } }, { @@ -107375,11 +107542,11 @@ "repo": "elizagamedev/shell-command-x.el", "unstable": { "version": [ - 20230918, - 1955 + 20231106, + 1958 ], - "commit": "5ad0a0270e22e6f89f2163e2dc65a0f39915793b", - "sha256": "1irgvim6b3ncdf1612r4z9rr7d6fymg7fs072pgkgcd7c6cs1h49" + "commit": "4b844554ee6250983717d136b2eadebcece945e3", + "sha256": "0r520k9fynlj5rbvwd48amd14vzlfzywz1bqrwm86w7vy06gy4qm" }, "stable": { "version": [ @@ -108812,14 +108979,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20231024, - 1738 + 20231110, + 1642 ], "deps": [ "terminal-focus-reporting" ], - "commit": "80b2e7c3be365c7685cc4070294359341799cd47", - "sha256": "1qa0dzy8qjdyd1m0bxwx269lrvqxz7hmyl95c55rr9pj928a3v12" + "commit": "24bb3bca50c67855eba077aeeb3af86c18569aae", + "sha256": "1gsqqcxmcx6v3ljwr7fj95ibxn8g798ycm4bi4v9n2ywqsn0kphk" } }, { @@ -110224,6 +110391,24 @@ } }, { + "ename": "smlfmt", + "commit": "a45339045d70e3a3f13dc2f4295c6f08fe3b5733", + "sha256": "1jvz81h0f7a95x5gkf4bh3pcjbxndji5yclza6s7kvxwdqpr7yrg", + "fetcher": "github", + "repo": "diku-dk/smlfmt.el", + "unstable": { + "version": [ + 20231102, + 853 + ], + "deps": [ + "reformatter" + ], + "commit": "7a70cce029a7c37c5e976ab6b426f62561e4e352", + "sha256": "05q28pg0ikyv7gzlvwjdh2546k8cmibf5dq455jmfd2xsnia8i2b" + } + }, + { "ename": "smmry", "commit": "ba2d4be4dd4d6c378eabd833f05a944afa21817b", "sha256": "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn", @@ -110505,15 +110690,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20231028, - 558 + 20231105, + 822 ], "deps": [ "dash", "s" ], - "commit": "dd092660aa7204060223377ba07e5d6c8b766d41", - "sha256": "0ssbwygc5c9jmd4vmj4y2pn9fpk2zd0m7qpkq2c6wnsl7z9g07rg" + "commit": "6132750f28091a774b087faea00d1363204c6922", + "sha256": "0lqk49mky6gg53a7pwhr1jys40jcw2cwafrwxm9jcknw01glrr4a" } }, { @@ -110608,14 +110793,14 @@ "repo": "md-arif-shaikh/soccer", "unstable": { "version": [ - 20230718, - 910 + 20231108, + 1633 ], "deps": [ "dash" ], - "commit": "5d8ff098eb91367e54a454d3f382940b8f5af81b", - "sha256": "0fyz2ffihi31364wq2p16j2968c31z8d1vilf6cplkq1knvz57my" + "commit": "96dd98a34238c8019d48507071df5d2b199360cd", + "sha256": "1ys401q58wm8sc3ly7w3vvpxcgz3i6gifcf19f2v6jd7pikcifrv" }, "stable": { "version": [ @@ -111514,11 +111699,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20231022, - 103 + 20231110, + 101 ], - "commit": "e930e89a87f15cfba3f7cc61a287a9044e2cd652", - "sha256": "1b86hyq0380yb99xbl3wkln4b8210y6fhsbniy1mjvvy9yw7x9m7" + "commit": "db107d1e9a716ffe531a0f73e7044bb8046d34c4", + "sha256": "13iyxz88ckzydhmy4wgfrfwp8dcj0dgb1rxwr5zcpqxrl1aifpjp" } }, { @@ -112060,11 +112245,11 @@ "repo": "matteoredaelli/sql-sqlline", "unstable": { "version": [ - 20201102, - 1508 + 20231109, + 2111 ], - "commit": "189c55261ecf0d7990edf7d1bb89776225e9092b", - "sha256": "1parczkwng2bfqmnj19dc4rmm69srvv1wysf0258xkdcb3kvppzx" + "commit": "3d540a8cc9c6f816b241913042008f09323455af", + "sha256": "0msqa8xknfiiphll1g4vlk1akxpn7n9i6rcds1v6r69zykxzb0mr" } }, { @@ -112265,11 +112450,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20231012, - 2016 + 20231030, + 539 ], - "commit": "5a9e177517d7de3a79a1d4f09294d49ffd6dfe7c", - "sha256": "0k47d6gfngl1zb9c0p44342k49fsgknl4yqanmbvwnx991h61bmj" + "commit": "eafeda97eb8942e5e2f1fe6ebf7472de9ce405dd", + "sha256": "1myrv3awf8v1haas63fhy7s81jkbbfv6zlbsb2nl8j723d5vm8jn" }, "stable": { "version": [ @@ -113569,6 +113754,21 @@ } }, { + "ename": "surround", + "commit": "1d196e36a3afd6d84206fb10dcdf71a1dd272835", + "sha256": "1cs2jgvshwqjfvazwzs4s2lw7r85bc11r2bri05qg6mhq5dxnmli", + "fetcher": "github", + "repo": "mkleehammer/surround", + "unstable": { + "version": [ + 20231022, + 1838 + ], + "commit": "b75abfaf3e157d232c10e09cd6316a0ad92d2468", + "sha256": "0xbprgglbjznrx43n1bqdsyfgnsv3r1fm7a2dvaga07kyhwnzy0a" + } + }, + { "ename": "suscolors-theme", "commit": "6f26b8281f9bd05e3c8f2ef21838275711e622c9", "sha256": "0j8yfl3yglp9kfdpbmfj3jw7npc6nlqw48cchiczh4biry204lbw", @@ -114298,11 +114498,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20230920, - 905 + 20231110, + 633 ], - "commit": "7a4e2f827ce76d522bb8c5202c4fc3cca7a7079a", - "sha256": "0j86jns2vh32biaalz2rikg5rjh0njzlkdgakri2zkgrsisd7wcj" + "commit": "970961c63c5949599f684d7b663608e4fe5de635", + "sha256": "02p98bwwwxd7qsxb967y5glgggwh27vh7sc606zy1hyhsx8nkigi" } }, { @@ -114835,20 +115035,17 @@ }, { "ename": "tab-jump-out", - "commit": "f84b8d995a13b8d30d15b3bf9f671dd06fb8522b", - "sha256": "0yyncbgdbw8lgjaycmky7wxhhxaqydks25qf565n2xj87snc5l7n", + "commit": "a5787b8baec7e47e7ca27a8398f64021226c377c", + "sha256": "06l0fv970fpsh6v6lzbphqq44aym5di44qwkvpp2p3pj7x4n9lry", "fetcher": "github", - "repo": "victorteokw/tab-jump-out", + "repo": "mkleehammer/tab-jump-out", "unstable": { "version": [ - 20151006, - 130 - ], - "deps": [ - "dash" + 20231023, + 342 ], - "commit": "1c3fec1826d2891177ea78e4e7cce1dc67e83e51", - "sha256": "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm" + "commit": "8cffbfafb24ea6d9121fd19e38e6a0c25caaa1c4", + "sha256": "1kpjn8129hhhsxy9z71l74nd41i9y9wijqnwmlz560pnsm2470sy" } }, { @@ -114975,14 +115172,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20231026, - 1454 + 20231108, + 1340 ], "deps": [ "project" ], - "commit": "3ff927ffc427d2debca56bc6ec2cbad37d85dd61", - "sha256": "1a11bbsckfn341xd0yw1jaalqn7w178fwxc2l8ag766bk878fmwr" + "commit": "3a0546d9e762600006d85a4c9785167d44ffe9a8", + "sha256": "1g36scf1620jg02xw2056vyrdx2mwm3qza4h00a1sc19i6qy50xq" } }, { @@ -115372,15 +115569,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20231004, - 1321 + 20231108, + 717 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "17bfa50c8f2e70daeb8866f3bf195f15623ab520", - "sha256": "1057zr4g8llxmzy47l5klyi89x66q8qx5vrd50pmpsp4c6772jz9" + "commit": "3e7bc49ccd579b2e68d00620424b9c10e38f56e5", + "sha256": "1bq1if84piww0mb9ciji7l2n2ac57c01kb6vldc96imhpri2fnny" }, "stable": { "version": [ @@ -116181,15 +116378,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20231027, - 1842 + 20231103, + 2037 ], "deps": [ "projectile", "toml" ], - "commit": "911e42d1b71e844b9821a4561154734adaa0f1e0", - "sha256": "1y1qdsm0rdjmxa4pgf1fhkim3ahkn70601l8d8snq5gdcfkx30s1" + "commit": "2fcd6ccb94869b854e9d12e0ba5d433adc336296", + "sha256": "1vjafad1j7kdmawsg6f9p7j2byg6mp4h46p4p8ww4i64smx6iqqp" } }, { @@ -116674,21 +116871,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231021, - 1233 + 20231106, + 1400 ], - "commit": "72cc23eeb9d696a22c6054d4de0a75a9c18fe46b", - "sha256": "05a64c2wmvky5m1vb9072scix2a6q7na448hf96aj40q3qbkh0ga" + "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", + "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" }, "stable": { "version": [ 2023, - 10, - 23, + 11, + 6, 0 ], - "commit": "72cc23eeb9d696a22c6054d4de0a75a9c18fe46b", - "sha256": "05a64c2wmvky5m1vb9072scix2a6q7na448hf96aj40q3qbkh0ga" + "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", + "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" } }, { @@ -118050,15 +118247,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231027, - 2121 + 20231103, + 2312 ], "deps": [ "compat", "seq" ], - "commit": "a8829875b25c0dc8cbd7163b6617c436365897b5", - "sha256": "0adk7fmz2ina9wkq8qbjc5jd677khy4f0mbzj4qfa7wsrwnxh69s" + "commit": "b4a29636365d12a8079c3908ff8ffce5f84b85d3", + "sha256": "1ckdjqlp063gprmy74b0ghl9zhwblkahifbqailww1wcbv40fmsz" }, "stable": { "version": [ @@ -118360,14 +118557,14 @@ "version": [ 0, 1, - 1 + 2 ], "deps": [ "compat", "transient" ], - "commit": "d620957377e451e8bf7c2eb7a2509a75f1ee160f", - "sha256": "1lf91cpylwl359ji2pd7cy2097mn416r3jnclycwfq69im9ybd7y" + "commit": "b8d48c81de06261926420d75608cc69f99970563", + "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr" } }, { @@ -118378,16 +118575,16 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20230419, - 1753 + 20231108, + 1749 ], "deps": [ "dash", "reazon", "s" ], - "commit": "e15b61e7e4ff98c44e6684fd2007bd1cbb31570e", - "sha256": "03mrmp3hpf2r7d6y78rfx2frzh98wkzg8qkcdv5azdg36gb21wc2" + "commit": "5f12ca6f366aad2c311bac09817f079900dce8d2", + "sha256": "0gs9jfv20mnjk3b6ry7vd5yfib0278c3l9gkkcdflbchgwyggq92" } }, { @@ -118525,26 +118722,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20231013, - 651 + 20231105, + 656 ], "deps": [ "tree-sitter" ], - "commit": "fc1aeedb484584d1dd5df5759a43cd6da018bcb7", - "sha256": "09chs0rh5dz7jb1c4yw4aqimfxyxjq9lrnlcrr6ibxm81aajjaar" + "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", + "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" }, "stable": { "version": [ 0, 12, - 72 + 77 ], "deps": [ "tree-sitter" ], - "commit": "fc1aeedb484584d1dd5df5759a43cd6da018bcb7", - "sha256": "09chs0rh5dz7jb1c4yw4aqimfxyxjq9lrnlcrr6ibxm81aajjaar" + "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", + "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" } }, { @@ -118621,8 +118818,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20231024, - 1919 + 20231109, + 1915 ], "deps": [ "ace-window", @@ -118634,8 +118831,8 @@ "pfuture", "s" ], - "commit": "95c07470b281a1eaa3ce88290748bcb2045a163a", - "sha256": "01d3kw4hl0vkqfw08nb9ldbhsd6s7shrmaxgjiahwxfkr63gvdjn" + "commit": "a1e855bce6c112d57994c991bc50775b6922f73e", + "sha256": "0vhlyqfa70jxc3yfh7g3vpr792kk88jsd16majn1jkqmldi6vk3r" }, "stable": { "version": [ @@ -118959,20 +119156,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20231009, - 959 + 20231110, + 50 ], - "commit": "e60ad69b7c42f9fee8d5f7c41acb9ab362ec99e6", - "sha256": "0hb98im9z5w799a6jz2j90mlrz2awdpydq038nbzk970bynd08r2" + "commit": "090a74deeff29530dbc0837ec3151dac8aa497e7", + "sha256": "0gswbpdnbyjp9jb6mgxsws11dp7nxi02w3f4bqc6d2z4zc7fd16d" }, "stable": { "version": [ 0, 6, - 4 + 6 ], - "commit": "1fcec670bebb0426dea2b638ff58bf21508c460d", - "sha256": "0qdi24x7snc8yvis6dv75w9ip8xs3cx101wcqsjrni2xdfqahz5d" + "commit": "f0cf4cf93f2877a07c61fb4d10d3fe51be4da3a8", + "sha256": "08kgx6a23a7g941bl6zxmkclwbiqsspx3z2vlpnzjwpqda1b3nxc" } }, { @@ -121273,11 +121470,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20231020, - 154 + 20231103, + 130 ], - "commit": "d113229b84b44d756fddaaaea1c246bc2e4df5ba", - "sha256": "0lm2azh6xvqbi78ji6ifjbdy6sf0a12sbry4b7vh96mqj3xr5186" + "commit": "821c3a84c8e26263d898566cc27b3982854db60c", + "sha256": "0p4lgn39k8r57b2q92hnx3mja9mp8ypvw27jbwms4mipy3qspr7d" } }, { @@ -122191,14 +122388,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20230930, - 1918 + 20231110, + 927 ], "deps": [ "compat" ], - "commit": "5c9a4af57b38fb1a6e78d3e23d50fc59b951241d", - "sha256": "1sg0jp02kqii8dn7p54wqmlwvprpjbqw0xly6vizwhbsqpjy0ka2" + "commit": "0492a686375cec2fab961ecd09f0eecf233810a7", + "sha256": "0fxr95780afcqw9fcc1r4yb3d5d02imqjv762iyqv7iszm61hacs" }, "stable": { "version": [ @@ -122373,11 +122570,11 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20231010, - 1133 + 20231031, + 748 ], - "commit": "8162a4e83460db503801f7dfdad3df75d6653fdb", - "sha256": "1ldz58gws5pqrnzzr7diva2qdfvk8bi4jfad6x9cal3cqp6dv961" + "commit": "957006ea834ff1a42b860b146fd40c86eda5eabd", + "sha256": "1h2gsy5vgq5zsvzxdds7bszhhj5hh7hf007bxbp9jlyar19alvsd" }, "stable": { "version": [ @@ -123156,8 +123353,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20230706, - 1130 + 20231031, + 802 ], "deps": [ "dash", @@ -123165,8 +123362,8 @@ "org-roam", "s" ], - "commit": "de199a16e294056e2368a2e031b19008cf9f9e52", - "sha256": "0wxnp7hiqa58n5q2ff863w0nzp5ii5fmzh8z4674s5mgjcaj7149" + "commit": "f4f220896aaaeee41b2341b74c1b9a554cf9c015", + "sha256": "03yhrrwnm5wgwy2k72cj9bgsmsbm0ylrlnr2dh5rzaaiwxq1kxvn" }, "stable": { "version": [ @@ -123536,16 +123733,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20231016, - 1405 + 20231105, + 856 ], "deps": [ "apel", "flim", "semi" ], - "commit": "3e8cf26abd9c5c8e4fc611032e259ca930665641", - "sha256": "0k9r3j7pcnvnnj0km8ggjdrf2nfgn1mfq7r7267bk3r3x92cvqh9" + "commit": "8c74d52d1ae00a0ca1a087fb4983292e2c068cba", + "sha256": "0ri6anarpfqbh5a04qhbmazw319m5b9b5yfx3n51ajia9f7xsjra" } }, { @@ -124128,13 +124325,13 @@ "stable": { "version": [ 1, - 14 + 15 ], "deps": [ "cl-lib" ], - "commit": "1f086f14f0f55f55eafd09f404f48e924157c1d1", - "sha256": "1dqdxw296mbkny1imrpm190l3v9hrdnl3xpg63pilkdz8vgcfl10" + "commit": "40c208eaab99999d7c1e4bea883648da24c03be3", + "sha256": "0bq0y63rriwsw6v8mn72773iqic2q52vx1j7mfa8br27sm6y1pd4" } }, { @@ -124657,11 +124854,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20230510, - 919 + 20231106, + 1901 ], - "commit": "bf131b99bb3f5583d27d1c72ef0fbd829ef85664", - "sha256": "1rnl9xgi45kyzr4vkdraj9cvhjz2rdnafsj63z6vg1gs18wm1ffz" + "commit": "93413908ec7d39a70700b4b97d3185b06ae69204", + "sha256": "15jgfh7kh6d76hpwp41p91y6blclmrjdw01b1g83sj3v9ncnykhq" }, "stable": { "version": [ @@ -124844,19 +125041,19 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231024, - 2323 + 20231103, + 700 ], - "commit": "83e902cfd9526cdefc973ce9b3f3d7415beb59f5", - "sha256": "1yjfywf8spi23zdcdj412msgyannwinvfgdarwbmiwpj9h8ll6qh" + "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", + "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "297c72eef2b4ec48abc8cb99640c101e4e164c94", - "sha256": "08s4a7msg8vaf7mrarbxl8wdrjzx7aj7mzb3zgq810w0l5snl4mh" + "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", + "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" } }, { @@ -124867,19 +125064,19 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231024, - 2311 + 20231103, + 700 ], - "commit": "cd887cf61f73a4cf044bd01cec60be7324660f9b", - "sha256": "15ngcigdx6yayg93kiiraqq2rng0zx54kbni5cgh0gnf673yqzwy" + "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", + "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "297c72eef2b4ec48abc8cb99640c101e4e164c94", - "sha256": "08s4a7msg8vaf7mrarbxl8wdrjzx7aj7mzb3zgq810w0l5snl4mh" + "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", + "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" } }, { @@ -125874,14 +126071,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20220426, - 2046 + 20231103, + 931 ], "deps": [ "visual-fill-column" ], - "commit": "a736205c194d7525feb1e1f10f4186c7b2b62bef", - "sha256": "1mhakk78gxhv2cahvg3ynzrfwj09l5aknvncmd3r09csrc0cwkfg" + "commit": "f4d035e91d20bf1dd3f2857b9cc344f844979a78", + "sha256": "0d9yq0qk6f61axpn4r2iby31c97sbra3lni2zg7nrckx2dn0kskd" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 4ecc511b6540d..517b2ca4fe79a 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -7,20 +7,27 @@ , file , libintl , hicolor-icon-theme +, python3 , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geany"; - version = "1.38"; + version = "2.0"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { - url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"; + url = "https://download.geany.org/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI="; }; + patches = [ + # The test runs into UB in headless environments and crashes at least on headless Darwin. + # Remove if https://github.com/geany/geany/pull/3676 is merged (or the issue fixed otherwise). + ./disable-test-sidebar.patch + ]; + nativeBuildInputs = [ pkg-config intltool @@ -28,6 +35,7 @@ stdenv.mkDerivation rec { which file hicolor-icon-theme + python3 wrapGAppsHook ]; @@ -35,6 +43,11 @@ stdenv.mkDerivation rec { gtk3 ]; + preCheck = '' + patchShebangs --build tests/ctags/runner.sh + patchShebangs --build scripts + ''; + doCheck = true; enableParallelBuilding = true; @@ -61,9 +74,9 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = "https://www.geany.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ frlan ]; platforms = platforms.all; mainProgram = "geany"; }; -} +}) diff --git a/pkgs/applications/editors/geany/disable-test-sidebar.patch b/pkgs/applications/editors/geany/disable-test-sidebar.patch new file mode 100644 index 0000000000000..a4b71516c5a57 --- /dev/null +++ b/pkgs/applications/editors/geany/disable-test-sidebar.patch @@ -0,0 +1,11 @@ +--- a/tests/Makefile.in 2023-10-19 18:10:06.000000000 +0200 ++++ b/tests/Makefile.in 2023-11-10 00:13:09.816498568 +0100 +@@ -86,7 +86,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-check_PROGRAMS = test_utils$(EXEEXT) test_sidebar$(EXEEXT) ++check_PROGRAMS = test_utils$(EXEEXT) + subdir = tests + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index 099aec1558b26..2a9557dce62ee 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/lifeograph"; rev = "v${version}"; - sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; + hash = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "lifeograph"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 446b73dc50c8d..b4555bc898789 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -24,10 +24,10 @@ let }; }; "7" = { - version = "7.05.2"; + version = "7.8"; src = fetchurl { url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip"; - hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8="; + hash = "sha256-tYQfPfzKRwClNwgSoJfMwG3LHhi3O/iFuuwIVHS8OXk="; }; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2ae3d7333ae45..ace04b883728d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1575,8 +1575,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.126.493"; - sha256 = "1an7z8z3xz2piw2xz1hdrs6l5rhpyvnjmb650ff2m4k24n01svfy"; + version = "1.135.544"; + sha256 = "sha256-OeG1nkQbQAfu8NuDEA+iaWy0ioFyXPe7Qm/CZIKPiX8="; }; meta = { @@ -1592,8 +1592,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.3.2023061502"; - sha256 = "sha256-sUoKwlPDMz+iQbmIsD2JhyDwmUQzOyCHXaXCUaizQ7k="; + version = "0.11.2023111001"; + sha256 = "sha256-sBDvqqyq0R0ZyS81G61fI9Vd860RIjhNzCqY0bdz1mg="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -2473,8 +2473,8 @@ let mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2022.7.11"; - sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; + version = "2023.8.50"; + sha256 = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; }; buildInputs = [ nodePackages.pyright ]; @@ -2485,6 +2485,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; homepage = "https://github.com/microsoft/pylance-release"; license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ericthemagician ]; }; }; @@ -3553,8 +3554,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.22"; - sha256 = "sha256-fJcSJwwRVofduWEEMa5f2VrSfyONKPkFl9OW+++lSRw="; + version = "0.0.23"; + sha256 = "sha256-NauXoYTAka8qXNPYlW5g7r6NNX1x8cnvDRbEGkRsMoY="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index baf26daefb565..a784455f70e5a 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01xw0dpwb4ih2xlpgc0yq48wqb5nmicz98srbgz01sbmyji8x1lf"; - x86_64-darwin = "13i449px6pajb94ymvi6vwmm25vyyh4vjrb86yiq4dcx1plcrxfc"; - aarch64-linux = "174zl811pv5rznxz3fh7bkwz9iini8lmb8xfjs4i14sym7sxw5x3"; - aarch64-darwin = "05kjmhr3dwbj16k4ilc8nl6ckm21fyak6pr1zzdxywqb5qd7qwr8"; - armv7l-linux = "0icc4cx5p5fxsi8cz3mxik4vnmrv2dvfzm220nl9p13bn1ri3f6s"; + x86_64-linux = "1vdgc4mnysij2sf87d5dfh0yw9j2a58lvmnwzzsj1icaydhkhfjy"; + x86_64-darwin = "0zxky35ifgjwb6p41mi3z34fvn49fpl09r1n9kp46ip8mqsm7gm7"; + aarch64-linux = "0qv0gbkfx78a393x44g6zmi5gs57d2cnjqlwfv0yrhkgi5s8v1ma"; + aarch64-darwin = "1rl4256h8i52akzy8g2bkydsi5llp05qqj0jr2di896x4niw57iz"; + armv7l-linux = "18mcf5x3h3mwlvhkl86b2wcl0adj7pr4aqr12va07mwlh2fp83h4"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.84.0"; + version = "1.84.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "d037ac076cee195194f93ce6fe2bdfe2969cc82d"; + rev = "1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "017g82h3jcygm6hi0s36ij8vxggz7p5j36nww5f53kn6a1s1wzcx"; + sha256 = "18kx7szx1v7dk0qqsw6cf40zd8mrc7a8snvm6i1n8q039d9mx2jz"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index c34629a3cf676..a22cf7cd4cd49 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cqkxd4pywkrvg3b96f1dyain6vlrb3di8a0yskmq3h58qd6k8rc"; - x86_64-darwin = "09y3whpp2z8fgb42pb9lw0b4wn0np3rdjkn5l1kldjljfrcwcn9g"; - aarch64-linux = "1kh8qylj77km8jhmx9a2bck7y4bb0fjx46sll7swagxz27b8ahi0"; - aarch64-darwin = "14g60sx3c5m02ly880sxwhmzvpxqw4pfij2ibgyprzdlpap0r2b0"; - armv7l-linux = "1s4rpd5p4kwmi89cml1106l9dccdwnqq3lyr8ym781pj9p75i8wp"; + x86_64-linux = "1v2lcbmb0g3pw58mmiqd2j9c7r7dcl371nxc6w9rsmcbf7s0f8h0"; + x86_64-darwin = "11if8l556rsvacwbsknv2hnqfwkad99klgnwx4kjcbm8g63ra3ab"; + aarch64-linux = "1fmahjn99cvylm8r4cf4b1654gyyk6n6mqad1l0cncpypdxc2pdw"; + aarch64-darwin = "053jnxpkpfh5a8nfx557ib6byhi4dd1dnxasp4igy59cbx25an9q"; + armv7l-linux = "0qc48mg34pkr23p3wnlczvfspfii3qn6ikbkgj1qsagxn9ycqjak"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.83.1.23285"; + version = "1.84.2.23314"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index f1874d62fba45..ee02b1eee071c 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -6,35 +6,24 @@ , makeWrapper , alsa-lib , curl -, egl-wayland , libao -, libdecor -, libevdev -, libffi -, libGL , libpulseaudio -, libX11 -, libXext -, libxkbcommon , libzip -, mesa +, lua , miniupnpc -, udev -, vulkan-headers +, SDL2 , vulkan-loader -, wayland -, zlib }: stdenv.mkDerivation rec { pname = "flycast"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "V${version}"; - sha256 = "sha256-PRInOqg9OpaUVLwSj1lOxDtjpVaYehkRsp0jLrVKPyY="; + rev = "v${version}"; + sha256 = "sha256-eQMKaUaZ1b0oXre4Ouli4qIyNaG64KntyRGk3/YIopc="; fetchSubmodules = true; }; @@ -47,23 +36,16 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib curl - egl-wayland libao - libdecor - libevdev - libffi - libGL libpulseaudio - libX11 - libXext - libxkbcommon libzip - mesa # for libgbm + lua miniupnpc - udev - vulkan-headers - wayland - zlib + SDL2 + ]; + + cmakeFlags = [ + "-DUSE_HOST_SDL=ON" ]; postFixup = '' diff --git a/pkgs/applications/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix index cacb521c2fbbf..05f837b187670 100644 --- a/pkgs/applications/emulators/gxemul/default.nix +++ b/pkgs/applications/emulators/gxemul/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "http://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; + url = "https://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://gavare.se/gxemul/"; + homepage = "https://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' GXemul is a framework for full-system computer architecture diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix index 2c374511af54c..6c5544aded3ef 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/applications/file-managers/dfilemanager/default.nix @@ -17,7 +17,7 @@ mkDerivation { cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { - homepage = "http://dfilemanager.sourceforge.net/"; + homepage = "https://github.com/probonopd/dfilemanager"; description = "File manager written in Qt/C++"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/pkgs/applications/file-managers/worker/default.nix b/pkgs/applications/file-managers/worker/default.nix deleted file mode 100644 index 3848487cbdc8c..0000000000000 --- a/pkgs/applications/file-managers/worker/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, libX11, fetchurl }: - -stdenv.mkDerivation rec { - pname = "worker"; - version = "4.12.1"; - - src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; - }; - - buildInputs = [ libX11 ]; - - meta = with lib; { - description = "A two-pane file manager with advanced file manipulation features"; - homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; - license = licenses.gpl2; - maintainers = []; - }; -} diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 8d01ce5f7a529..3faf4d304a5fa 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -12,6 +11,7 @@ , bison , cmake +, draco , exiv2 , fcgi , flex @@ -64,8 +64,8 @@ let owslib psycopg2 pygments - pyqt-builder pyqt5 + pyqt-builder python-dateutil pytz pyyaml @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.32.3"; + version = "3.34.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ge5ne22sDLKbrJk2vYQxpu3iRXSoOk9924c/RdtD3Nc="; + hash = "sha256-+Yzp8kfd7cfxTwsrxRo+6uS+2Aj4HfKA2E8hSf7htsU="; }; passthru = { @@ -104,6 +104,7 @@ in mkDerivation rec { ]; buildInputs = [ + draco exiv2 fcgi geos @@ -142,11 +143,6 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch"; - hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14="; - }) ]; # Add path to Qt platform plugins @@ -156,8 +152,9 @@ in mkDerivation rec { ''; cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" - "-DWITH_PDAL=TRUE" + "-DWITH_PDAL=True" "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 093a53978a06f..eb9d54d5cfc17 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -15,6 +15,7 @@ , pkg-config , poppler , python3 +, wrapGAppsHook # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: @@ -59,6 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config + wrapGAppsHook ] ++ lib.optionals withDocs [ dblatex diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2a7e0e9ac0fc2..be714028ec9ac 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -67,6 +67,14 @@ mkDerivation rec { hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch"; + hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 371da24680e0f..27e5fb81b8d07 100644 --- a/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -24,12 +24,13 @@ diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index 52c47168af..9966bd0013 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp -@@ -554,7 +554,7 @@ void initInterpreter(int argc,char *argv[]) +@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) { PyStatus status; PyConfig config; -- PyConfig_InitIsolatedConfig(&config); -+ PyConfig_InitPythonConfig(&config); + PyConfig_InitIsolatedConfig(&config); ++ config.isolated = 0; ++ config.use_environment = 1; status = PyConfig_SetBytesArgv(&config, argc, argv); if (PyStatus_Exception(status)) { diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 76b2a38320d82..857365cd66d53 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,6 +9,7 @@ , boost , coin3d , eigen +, freecad # for passthru.tests , gfortran , gts , hdf5 @@ -35,6 +36,7 @@ , qtwebengine , qtx11extras , qtxmlpatterns +, runCommand # for passthru.tests , scipy , shiboken2 , soqt @@ -147,6 +149,21 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd ''; + passthru.tests = { + # Check that things such as argument parsing still work correctly with + # the above PYTHONPATH patch. Previously the patch used above changed + # the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`, + # which caused the built-in interpreter to attempt (and fail) to doubly + # parse argv. This should catch if that ever regresses and also ensures + # that PYTHONPATH is still respected enough for the FreeCAD console to + # successfully run and check that it was included in `sys.path`. + python-path = runCommand "freecad-test-console" { + nativeBuildInputs = [ freecad ]; + } '' + HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" </dev/null + ''; + }; + meta = { homepage = "https://www.freecad.org"; description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix index f8cb634cad704..6ff2f43399584 100644 --- a/pkgs/applications/graphics/kphotoalbum/default.nix +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, fetchpatch , fetchurl , lib , extra-cmake-modules @@ -25,6 +26,14 @@ mkDerivation rec { hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch"; + hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c="; + }) + ]; + # not sure if we really need phonon when we have vlc, but on KDE it's bound to # be on the system anyway, so there is no real harm including it buildInputs = [ exiv2 phonon libvlc ]; diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/applications/graphics/lorien/default.nix index c880e2e216797..ad7442a93ccbd 100644 --- a/pkgs/applications/graphics/lorien/default.nix +++ b/pkgs/applications/graphics/lorien/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "lorien"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mbrlabs"; repo = "Lorien"; rev = "v${version}"; - sha256 = "sha256-x81Obana2BEGrYSoJHDdCkL6UaULfQGQ94tlrH5+kdY="; + sha256 = "sha256-mPv/3hyLGF3IUy6cKfGoABidIsyw4UfmhfhS4AD72K8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 37fcc0eb48e1b..fc048d4acae8d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -105,7 +105,7 @@ mkDerivation rec { machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. ''; - homepage = "http://openscad.org/"; + homepage = "https://openscad.org/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index 4e9f33621ffd2..6c6ea1059c73a 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4="; + sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 6a7a57fd25f2f..9513b92f60ac5 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -30,8 +30,13 @@ stdenv.mkDerivation rec { hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; + postPatch = '' + # exiv2 0.28.1 + substituteInPlace CMakeLists.txt \ + --replace "exiv2lib" "exiv2" + '' # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? - postPatch = lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace cplusplus/main.cpp \ --replace "std::setlocale" "setlocale" ''; diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 58a52aee4943c..0463958b4c6c2 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -13,7 +13,7 @@ in gnustep'.gsmakeDerivation rec { version = "1.0-b10"; src = fetchurl { - url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz"; + url = "https://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz"; sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77"; }; @@ -38,8 +38,8 @@ in gnustep'.gsmakeDerivation rec { meta = with lib; { description = "Application for drawing and editing pixel-art images"; - homepage = "http://twilightedge.com/mac/pikopixel/"; - downloadPage = "http://twilightedge.com/mac/pikopixel/"; + homepage = "https://twilightedge.com/mac/pikopixel/"; + downloadPage = "https://twilightedge.com/mac/pikopixel/"; license = licenses.agpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 66ed4b4fa54f2..dd13f8ba4503d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.26"; + version = "0.0.27"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - hash = "sha256-p+ZL3oxzwKhh+j1bxakgyStH+1GAu2aEwNmsqo6fNFo="; + hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 74cc2bdc4e8dc..7f90c815837ae 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { in mind (follows Gnome HIG2). ''; license = licenses.gpl3; - homepage = "http://siyanpanayotov.com/project/viewnior/"; + homepage = "https://siyanpanayotov.com/project/viewnior/"; maintainers = with maintainers; [ smironov artturin ]; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 3b40643a0b8da..7ad0d1ab66418 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -24,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-po/CzUnUFh1saJuw8CVk4zeWsVAgw2iPdfq81t0zwU8=" +, cargoSha256 ? "sha256-YR7d8F1LWDHY+h2ZQe52u3KWIeEMTnrbU4DO+hpIOec=" }: mkDerivation rec { diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1671bf1e674cf..f074bbeee63a2 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.2/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index b50415cd24f61..b8df9043eb1f6 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1955 +4,1955 @@ { akonadi = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-23.08.2.tar.xz"; - sha256 = "186fjzknyqa6iskj298n93l74k4r3p58h4a9r9rda65l7ynmnrjz"; - name = "akonadi-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-23.08.3.tar.xz"; + sha256 = "0h9yzd33psycpcdqb4c54s0dysifmjjrwygjk7rbhfph8099y864"; + name = "akonadi-23.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-calendar-23.08.2.tar.xz"; - sha256 = "1ngjxqnilyz7wgyxgy4x4vcxr5a2g3n6aacx5yl2gzmmwqnxm3pf"; - name = "akonadi-calendar-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-calendar-23.08.3.tar.xz"; + sha256 = "1r9h40m0jha2qzj63l8xwsxn8avmak2h7k3vxi91wdnd288cdnib"; + name = "akonadi-calendar-23.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-calendar-tools-23.08.2.tar.xz"; - sha256 = "01w56hz7fbk8hzjn5x9h4nhp3yxqywyi3q7r9a8ycvanhzyjxmca"; - name = "akonadi-calendar-tools-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-calendar-tools-23.08.3.tar.xz"; + sha256 = "0vwfq3nls3c9qxm4kd9cb42p1x2na0mfjcg4cnlffas8bhg1sll5"; + name = "akonadi-calendar-tools-23.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-contacts-23.08.2.tar.xz"; - sha256 = "1zxa8sm7wnkn0hdknwrcw55l1w8ipwz7zn4v9jrx8g92x4ijb7vj"; - name = "akonadi-contacts-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-contacts-23.08.3.tar.xz"; + sha256 = "0kf99fhykxb957f8iipw98nn16j3nqp730nsahwd3nhknb517v0r"; + name = "akonadi-contacts-23.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-import-wizard-23.08.2.tar.xz"; - sha256 = "13xfgmj56haqai30wz0ai187ncp1xf5944b52c5905lzcfh2imky"; - name = "akonadi-import-wizard-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-import-wizard-23.08.3.tar.xz"; + sha256 = "1hvpb29mym0psibzn7vdyd466bnf03z3bwmwbk406w7zkc1ahh35"; + name = "akonadi-import-wizard-23.08.3.tar.xz"; }; }; akonadi-mime = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-mime-23.08.2.tar.xz"; - sha256 = "0a0pmh0ny0grfxw8ld2gibr2sxzp7a60vy00wjwfvjxkpizg7syi"; - name = "akonadi-mime-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-mime-23.08.3.tar.xz"; + sha256 = "07qwkkbjdcpi0b18fndal2nxbxz0nawihway93dzj8w7zzcf5pg8"; + name = "akonadi-mime-23.08.3.tar.xz"; }; }; akonadi-notes = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-notes-23.08.2.tar.xz"; - sha256 = "1wvxqz2zrzjvi5vf6fb5r2ljv5q5c16vrphk4kjl6dq16mlki207"; - name = "akonadi-notes-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-notes-23.08.3.tar.xz"; + sha256 = "1z9i7wd72kqy07wrh31zrl15swny38azhn2l3c6w9gc5zhl6sf9g"; + name = "akonadi-notes-23.08.3.tar.xz"; }; }; akonadi-search = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadi-search-23.08.2.tar.xz"; - sha256 = "1yw24jqlin38l61fdb3xvbhih5vpq7378ral44mlkx3wk3manzrs"; - name = "akonadi-search-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadi-search-23.08.3.tar.xz"; + sha256 = "066v60c358znm2s32m98jpmqj53zhh887mmylqrd1rak3p8xbwfc"; + name = "akonadi-search-23.08.3.tar.xz"; }; }; akonadiconsole = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akonadiconsole-23.08.2.tar.xz"; - sha256 = "0kkc8pb4iqiajiw9y3akn8gsacg9cxc7g3g5hc5pscfcwpmqvjnp"; - name = "akonadiconsole-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akonadiconsole-23.08.3.tar.xz"; + sha256 = "1jg47kjabfbmvxdg972p5wm97jngxsqswmql2j32fpiq5vcwjjg3"; + name = "akonadiconsole-23.08.3.tar.xz"; }; }; akregator = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/akregator-23.08.2.tar.xz"; - sha256 = "1sh65xzm035ph1b0ivcwcjz34254n4z0vmh74qbzlx016m87sc9q"; - name = "akregator-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/akregator-23.08.3.tar.xz"; + sha256 = "0brq2m91ahsyvvn30hlpc18igbpij0dgxixis147m8i1aidyi7hh"; + name = "akregator-23.08.3.tar.xz"; }; }; alligator = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/alligator-23.08.2.tar.xz"; - sha256 = "1lcjb2gi0d17qcqfwffy19y3rm5cacf1dkpqxw7zcpq8y6n5vbdp"; - name = "alligator-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/alligator-23.08.3.tar.xz"; + sha256 = "1w54frf5rm0x40451kffs0qh1jsagx9jihwpigvjmhl0i7dknvpp"; + name = "alligator-23.08.3.tar.xz"; }; }; analitza = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/analitza-23.08.2.tar.xz"; - sha256 = "0kc763igs0lz7gz7xb252a2c20dhfhw8f3sc51x4hx6m0q738rjj"; - name = "analitza-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/analitza-23.08.3.tar.xz"; + sha256 = "14lg9w5x4rcy4sn9yxj9a035k9c5c7ijcfmxr1hcs45dgcapd5si"; + name = "analitza-23.08.3.tar.xz"; }; }; angelfish = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/angelfish-23.08.2.tar.xz"; - sha256 = "06axmw7q4f45yg11a77v883pm9b3mav4wc98n9i2ffcbbm18xxm7"; - name = "angelfish-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/angelfish-23.08.3.tar.xz"; + sha256 = "1f8q9h8aac2mdfrd4rxq1kyzvzradb3azrasdzfc4m941ka3lrgb"; + name = "angelfish-23.08.3.tar.xz"; }; }; arianna = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/arianna-23.08.2.tar.xz"; - sha256 = "1sazdq6g8v15xsi8plx97wkhs7n8nxx2l46vklymwkhr0igd9aw4"; - name = "arianna-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/arianna-23.08.3.tar.xz"; + sha256 = "1drfaswzmlw8jws6l07550qa92fp00pp6860lyw92kapw8wh25zf"; + name = "arianna-23.08.3.tar.xz"; }; }; ark = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ark-23.08.2.tar.xz"; - sha256 = "0vrbwy787a2lhwx1pv5pcyqjk3c8d0mln6ff3s2nqixfbszfc4ii"; - name = "ark-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ark-23.08.3.tar.xz"; + sha256 = "0vrjs94ncwbixr4q10rs3cjxbgxgwyrh96wbk78q2lv620xb8byk"; + name = "ark-23.08.3.tar.xz"; }; }; artikulate = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/artikulate-23.08.2.tar.xz"; - sha256 = "1l72929n78lwpr1ic0qsqg77h74hqcb1z4q599q67imqmbdzp1is"; - name = "artikulate-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/artikulate-23.08.3.tar.xz"; + sha256 = "0kx1ma6vf04ylr34skfwbprxq2x9wzr7x8nxv10jqhrr73g0vgv1"; + name = "artikulate-23.08.3.tar.xz"; }; }; audiocd-kio = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/audiocd-kio-23.08.2.tar.xz"; - sha256 = "0mn0kjy5yqc1qk1gz1hf6ghlansryah0ynkiiyyrqbi2h0f8r8sf"; - name = "audiocd-kio-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/audiocd-kio-23.08.3.tar.xz"; + sha256 = "1dvqkmh9ndv6iqlk0qv09s0yhrxpc1n2p5zw4ll6hinw9gagbkvv"; + name = "audiocd-kio-23.08.3.tar.xz"; }; }; audiotube = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/audiotube-23.08.2.tar.xz"; - sha256 = "0iw1x4gjq6y05lsvryk4p34jxmcmm5k5jpcwmnfgf50ly4cgn7d9"; - name = "audiotube-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/audiotube-23.08.3.tar.xz"; + sha256 = "0j57zw0jmagpd9924c2drz4g52i5i8kw81yvka6qamj0n1db6awg"; + name = "audiotube-23.08.3.tar.xz"; }; }; baloo-widgets = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/baloo-widgets-23.08.2.tar.xz"; - sha256 = "1fd639gn20a2vrxc8h3p705nbkiy94nf5sbfwvf6pi796a0hyxb8"; - name = "baloo-widgets-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/baloo-widgets-23.08.3.tar.xz"; + sha256 = "1p4cpcdxbab0nqgs8933dh73pkjr9j8vd8b3wz0s295bpws560mz"; + name = "baloo-widgets-23.08.3.tar.xz"; }; }; blinken = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/blinken-23.08.2.tar.xz"; - sha256 = "0p1si75nicxvj4cqdzrdi7lf2ij0js7wirfmram32rnl59q9nca5"; - name = "blinken-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/blinken-23.08.3.tar.xz"; + sha256 = "06sqp8ghbapkfwbf4m74rp28lcv2ql3djfz5ngavgby4mh0fy06j"; + name = "blinken-23.08.3.tar.xz"; }; }; bomber = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/bomber-23.08.2.tar.xz"; - sha256 = "1vsmsc915hisliqbj8zc681qlbr807f4538nk4s83k5ifdbp86w9"; - name = "bomber-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/bomber-23.08.3.tar.xz"; + sha256 = "0fcxp7jcimqpij250rcwr5xkwk3wghjsf0x0b8gxs5s7a2x3ywkf"; + name = "bomber-23.08.3.tar.xz"; }; }; bovo = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/bovo-23.08.2.tar.xz"; - sha256 = "1vp9a42k4jf3rfmyi0y1mzbnbhjyz8g9p5bhlrjdsim9mccxic5s"; - name = "bovo-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/bovo-23.08.3.tar.xz"; + sha256 = "19ab8z30g19k7vs27cyfgmv8kaadr6a7i50rndsbhbjdwkmi7n9g"; + name = "bovo-23.08.3.tar.xz"; }; }; calendarsupport = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/calendarsupport-23.08.2.tar.xz"; - sha256 = "1642bbq4px41qcd6vl88wk6ap9l30wn7c3g974b7v89hvyfjn8hl"; - name = "calendarsupport-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/calendarsupport-23.08.3.tar.xz"; + sha256 = "180gkqh3xpm93r8jh381d6ihjg68gzkjqn9pmak32whg8012q4bd"; + name = "calendarsupport-23.08.3.tar.xz"; }; }; calindori = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/calindori-23.08.2.tar.xz"; - sha256 = "1q4zxfpmh6m8a5873d7hjljq9gz44pq7294gxccjmzcszdz65g49"; - name = "calindori-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/calindori-23.08.3.tar.xz"; + sha256 = "0800khsn96lsgv5iwmkdrxgsdvyddvjgpfrv7rp3bd3jj21qb8br"; + name = "calindori-23.08.3.tar.xz"; }; }; cantor = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/cantor-23.08.2.tar.xz"; - sha256 = "0qdr3yrqh3qfzcdyq001iw4h4sjhcs4qdprb8wibnyr7ss5gdh8w"; - name = "cantor-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/cantor-23.08.3.tar.xz"; + sha256 = "009azpj5frkpc4yc3cc6jqhd5prwmkab1m5j6khmyg78vdrfibcw"; + name = "cantor-23.08.3.tar.xz"; }; }; cervisia = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/cervisia-23.08.2.tar.xz"; - sha256 = "04n77kjbqzq5wiw1pm58g8rghq9q3l5rzsaqld9v80r2lykrjmm4"; - name = "cervisia-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/cervisia-23.08.3.tar.xz"; + sha256 = "0nncgcn67ksv0xw3fsf90pqi6mjqca4v6wr52pf0knpy7a22hpig"; + name = "cervisia-23.08.3.tar.xz"; }; }; colord-kde = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/colord-kde-23.08.2.tar.xz"; - sha256 = "0b15vja6j80ldas5cj0j2qjqf8rmjd39ir7h3jsaw4mv2c0g79wx"; - name = "colord-kde-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/colord-kde-23.08.3.tar.xz"; + sha256 = "14baqrdwwssd305qhvxils0sbbdw6hdz4ggg3qkp30xc18vdp270"; + name = "colord-kde-23.08.3.tar.xz"; }; }; dolphin = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/dolphin-23.08.2.tar.xz"; - sha256 = "0bvb7zsnr01k7aspr9g8mffp8753xzxv0xhgqq5ap8f420j0ijhb"; - name = "dolphin-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/dolphin-23.08.3.tar.xz"; + sha256 = "17msggyxykq3gvzl6h9fxrmc06s7h74279rdfmckvprxi5yqfknm"; + name = "dolphin-23.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/dolphin-plugins-23.08.2.tar.xz"; - sha256 = "13mhgk43hb151q1gvbqvb39k9smzpras54j88xvg8aj7anal1v8h"; - name = "dolphin-plugins-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/dolphin-plugins-23.08.3.tar.xz"; + sha256 = "0s57n5bg0sq9xj38rq8sy6fv6biiwrxg85a4xq0hqsjfcy7gwk89"; + name = "dolphin-plugins-23.08.3.tar.xz"; }; }; dragon = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/dragon-23.08.2.tar.xz"; - sha256 = "0r5q8g6jsrdni4ri1044b21n1fgigwwdfa2r5sp8svb1p2579jpq"; - name = "dragon-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/dragon-23.08.3.tar.xz"; + sha256 = "0hf4agxqs8y7ivrd2ikr1ld1liam5kncswsxi25al1hv5c49qirf"; + name = "dragon-23.08.3.tar.xz"; }; }; elisa = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/elisa-23.08.2.tar.xz"; - sha256 = "1r0b6mnp4vg5xm1pzbps60nlzy670wqwbgg5k3i7zkirqfv7dd86"; - name = "elisa-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/elisa-23.08.3.tar.xz"; + sha256 = "1nb6scjq9aj8cd5paqyyhx4l9lp6a4rq8f0dkkmq55nb4ixq1nz5"; + name = "elisa-23.08.3.tar.xz"; }; }; eventviews = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/eventviews-23.08.2.tar.xz"; - sha256 = "1bixmkna8lb473xmsjs3qdsnws3dlk89s47cqa9mjs406p79iv52"; - name = "eventviews-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/eventviews-23.08.3.tar.xz"; + sha256 = "0hazaxgil90pa9y2ja4f76h78yppiykqh2c216qrsqaw22lisgiw"; + name = "eventviews-23.08.3.tar.xz"; }; }; falkon = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/falkon-23.08.2.tar.xz"; - sha256 = "0skz9jzipz6rnhrbr7cvm1h2wrakxiz1pi0ckbmijp0fwadmm5sp"; - name = "falkon-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/falkon-23.08.3.tar.xz"; + sha256 = "00py03fbj105knqmrj370ca8lyipiknwjvhswli3hv8ksk5wsxxi"; + name = "falkon-23.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ffmpegthumbs-23.08.2.tar.xz"; - sha256 = "1zvw61prmx9bakqfaj44vb19kwfxnxp9w7h0v0ld9v2ic4k4bhzy"; - name = "ffmpegthumbs-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ffmpegthumbs-23.08.3.tar.xz"; + sha256 = "109766pkhqwq8vk14av79c18lpw73q553b9l9asrkh5s0gzignmh"; + name = "ffmpegthumbs-23.08.3.tar.xz"; }; }; filelight = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/filelight-23.08.2.tar.xz"; - sha256 = "1mszbwa69ry9010ndfh5f5z00k36xqlccs73g8vbmlnqx9x9100n"; - name = "filelight-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/filelight-23.08.3.tar.xz"; + sha256 = "12hq3q0my6lfa0ql1smgyxqbq9dcv8i70rc1s7w69b7k9y45nnp2"; + name = "filelight-23.08.3.tar.xz"; }; }; ghostwriter = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ghostwriter-23.08.2.tar.xz"; - sha256 = "00dha4q9myff3maaj5im2qxxq191glnswynifgxnqxrndq63ic1i"; - name = "ghostwriter-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ghostwriter-23.08.3.tar.xz"; + sha256 = "0pfr9s6csk2w3qzr48sg6y4fpvh7xflja12pva9sp8whzplg7wda"; + name = "ghostwriter-23.08.3.tar.xz"; }; }; granatier = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/granatier-23.08.2.tar.xz"; - sha256 = "1175rcskxd43x9zj9mmf84z3b4njrbdg0da9byc27b5z1n8c6phf"; - name = "granatier-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/granatier-23.08.3.tar.xz"; + sha256 = "1wjwj4lwn992wgsmqdvs50jy60vcpim5y56a6xrwxcdbhcvj65px"; + name = "granatier-23.08.3.tar.xz"; }; }; grantlee-editor = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/grantlee-editor-23.08.2.tar.xz"; - sha256 = "0p02fnk50hvkr9a51s07r992k33cz0lk0flhqla2i6zn5rf7qr6j"; - name = "grantlee-editor-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/grantlee-editor-23.08.3.tar.xz"; + sha256 = "1wdss8narjdr5fvqqysh0mnj47d86lhdj2zk8a5vz6cijvyd9076"; + name = "grantlee-editor-23.08.3.tar.xz"; }; }; grantleetheme = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/grantleetheme-23.08.2.tar.xz"; - sha256 = "040wz413zxnjrkjzrhfsdj81nv0rzc3mk4df1zr1v9lbg5s26ip3"; - name = "grantleetheme-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/grantleetheme-23.08.3.tar.xz"; + sha256 = "127wxfa1n9akb1i746h9fbg3xsc7127lmgl8qa0y09bjj217dd2r"; + name = "grantleetheme-23.08.3.tar.xz"; }; }; gwenview = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/gwenview-23.08.2.tar.xz"; - sha256 = "026dh8d1dwb6dq687wxz4cm82ddsnnf91nw804rigs89ybv1zkxj"; - name = "gwenview-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/gwenview-23.08.3.tar.xz"; + sha256 = "0g6qm3nzcsgm5l8h8fkd9hc26zgf3k6vy510m27y3jra7p7rn2hs"; + name = "gwenview-23.08.3.tar.xz"; }; }; incidenceeditor = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/incidenceeditor-23.08.2.tar.xz"; - sha256 = "0mq1iccapyifd80aahmj3nz6hcjf5yfymj5c8bfyp5dwfzwxjdh1"; - name = "incidenceeditor-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/incidenceeditor-23.08.3.tar.xz"; + sha256 = "07zljj30n6f80fw4p53hxz1frjs6camc1zyvx876rl8bxssd7c06"; + name = "incidenceeditor-23.08.3.tar.xz"; }; }; itinerary = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/itinerary-23.08.2.tar.xz"; - sha256 = "1vxxadxj5j694qykkw8qhrb7r87j35nbpnq9mpad7nw472ipvfab"; - name = "itinerary-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/itinerary-23.08.3.tar.xz"; + sha256 = "1bgrj6i24lg9xv7kz7z1dk0xqgvbc15w1hz0r4mrwm4w151r9w77"; + name = "itinerary-23.08.3.tar.xz"; }; }; juk = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/juk-23.08.2.tar.xz"; - sha256 = "1ijnygq2khlgbhfiq0x0m0wbaxad9j6gcsh3q8b85kdd8qw3mxcr"; - name = "juk-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/juk-23.08.3.tar.xz"; + sha256 = "1y4wfilvpd3zbjw33lzk7amjb20c8gb2lmcl85mqyksmmsv7kl1j"; + name = "juk-23.08.3.tar.xz"; }; }; k3b = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/k3b-23.08.2.tar.xz"; - sha256 = "05rlxj1w35g2hv5av6xca81kazyzabb6mxvg2z1yjj2fp7girfns"; - name = "k3b-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/k3b-23.08.3.tar.xz"; + sha256 = "12jvb72vr3g1z9qbjjxxlpcvrpvmm8n0d02fs4fpvnmqzbxlkiw3"; + name = "k3b-23.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kaccounts-integration-23.08.2.tar.xz"; - sha256 = "0igxswi4bi1y34j4y6lgzfdgbp113zhw7qb1x0gannjsl912c7nc"; - name = "kaccounts-integration-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kaccounts-integration-23.08.3.tar.xz"; + sha256 = "0na3sy9dcn6qndivyr5yi2az0fvl6a8ywi4x775dxi2nncbjb730"; + name = "kaccounts-integration-23.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kaccounts-providers-23.08.2.tar.xz"; - sha256 = "0s9zzwjd42q0dh8l9qblqvn92l8m22b8sj8dal6i77dyb20cmbvk"; - name = "kaccounts-providers-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kaccounts-providers-23.08.3.tar.xz"; + sha256 = "1fz5k81xci4xwvgg79jhjpldblfbc5yagqggc28dkqvrzfzij6nb"; + name = "kaccounts-providers-23.08.3.tar.xz"; }; }; kaddressbook = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kaddressbook-23.08.2.tar.xz"; - sha256 = "02jcc7380x0irxl5xxkpnjrfh4xc87y79l8yn6fr3y9r25hpribb"; - name = "kaddressbook-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kaddressbook-23.08.3.tar.xz"; + sha256 = "10n1d0p24fvcalwdl54cgg1n12yj476w343sqjrijzqp8j4a82pr"; + name = "kaddressbook-23.08.3.tar.xz"; }; }; kajongg = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kajongg-23.08.2.tar.xz"; - sha256 = "17z2qirqh59y491nhkg5syv737afq9g19nf4f1aj48l1ph5xbacr"; - name = "kajongg-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kajongg-23.08.3.tar.xz"; + sha256 = "1xdw8j4qxgqaxrj7dwazmzdrj88gzvgzcd45g7s4kimyf05pjpk5"; + name = "kajongg-23.08.3.tar.xz"; }; }; kalarm = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kalarm-23.08.2.tar.xz"; - sha256 = "1r6vp5n37w6l5mh6nq67iwmnd978gjk6j2zyk8zkw2k907phf23g"; - name = "kalarm-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kalarm-23.08.3.tar.xz"; + sha256 = "072m43s3dr7xdvplvvfvb1s5rgy6rbq540cjx239hwpd3qkg1ri8"; + name = "kalarm-23.08.3.tar.xz"; }; }; kalgebra = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kalgebra-23.08.2.tar.xz"; - sha256 = "0bs1yn3kx7gsqmyvm4if6bnqlpz4vlj27jy9c56v5pvnx63gfbim"; - name = "kalgebra-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kalgebra-23.08.3.tar.xz"; + sha256 = "104niva0c2ghqzydb433allm4g7yh2kfrglm5h2gw9p8rr792m9k"; + name = "kalgebra-23.08.3.tar.xz"; }; }; kalk = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kalk-23.08.2.tar.xz"; - sha256 = "1cbqymrkij1japcirr8ny8j2pjydv2x2v70dv05d4lfk2qqgnp0s"; - name = "kalk-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kalk-23.08.3.tar.xz"; + sha256 = "0b3ifhiyl89syf2jawcddwk8zp1j1zgvg26lcqmi2plw67mvc7lj"; + name = "kalk-23.08.3.tar.xz"; }; }; kalzium = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kalzium-23.08.2.tar.xz"; - sha256 = "122zl2xgaqsfnhngn3pwhszqyfqb2pg8ck4ncmsi3gghfizflx4h"; - name = "kalzium-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kalzium-23.08.3.tar.xz"; + sha256 = "0pybhz6p2i92iv1zgn9prqqqaim0173n1pvbfrk00kbb1cfcpkbw"; + name = "kalzium-23.08.3.tar.xz"; }; }; kamera = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kamera-23.08.2.tar.xz"; - sha256 = "0j0iqxrgqfrcbfwa9i6wphyxnhsf7rlhaa0d29lrs0sfy1yw4g3y"; - name = "kamera-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kamera-23.08.3.tar.xz"; + sha256 = "1y1f4salx1svhar3bpvg5a5j1bwmi6n3drqzd3zvkfvfhdzzvsrp"; + name = "kamera-23.08.3.tar.xz"; }; }; kamoso = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kamoso-23.08.2.tar.xz"; - sha256 = "1vsbv3k0795a1pv837pw0m42w121v0vjivhxrlfl09p5j0avyfs5"; - name = "kamoso-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kamoso-23.08.3.tar.xz"; + sha256 = "1f31c5kbaf7dbksrnb3fmgcwk8b3qp4q94c99h6napm3q3p4bkbi"; + name = "kamoso-23.08.3.tar.xz"; }; }; kanagram = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kanagram-23.08.2.tar.xz"; - sha256 = "1a9vcxkk80fdd0v7rwfmjcgg6zv6kb7wbs4jicm7ryqdp4i5njca"; - name = "kanagram-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kanagram-23.08.3.tar.xz"; + sha256 = "12x1pgd4hfha16jb3bf7ywm4p98zh0c7m98bx4slxryhxc8glmmp"; + name = "kanagram-23.08.3.tar.xz"; }; }; kapman = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kapman-23.08.2.tar.xz"; - sha256 = "02ynpy5ansva1i5cajknh2padp9ipszvyb706xi66wihyj6s5d6n"; - name = "kapman-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kapman-23.08.3.tar.xz"; + sha256 = "1jhifmif3dwflc8j4mg8h7sd29kxz8fd3mw7d8rb60j1z1xarjx9"; + name = "kapman-23.08.3.tar.xz"; }; }; kapptemplate = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kapptemplate-23.08.2.tar.xz"; - sha256 = "19anra5qd0v3lcb8a0h2ffqm5xbz9kvdarf7cz7pvw8by815dlmc"; - name = "kapptemplate-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kapptemplate-23.08.3.tar.xz"; + sha256 = "0hzbhfkch9l7yaiv3j1pr4ankjzjr7cfv5s87a19nif31jwy05gd"; + name = "kapptemplate-23.08.3.tar.xz"; }; }; kasts = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kasts-23.08.2.tar.xz"; - sha256 = "1lhgl8ds93m783fxmkg6wgj92y8jz40cch0hzgxqwixi6j0cnlnx"; - name = "kasts-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kasts-23.08.3.tar.xz"; + sha256 = "136gsrxgbzdd1jsm23cyzzj02yhgjcbmywn7qnzg69hcd9rxpfkn"; + name = "kasts-23.08.3.tar.xz"; }; }; kate = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kate-23.08.2.tar.xz"; - sha256 = "0n8j6idmvfqy4gg4l3dm38lyjk2jh188rmd4wpgyi53f3riiciwp"; - name = "kate-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kate-23.08.3.tar.xz"; + sha256 = "16m2v46msl065841z62h2dpnndif3j1gafd2vspy77n41aqhikqp"; + name = "kate-23.08.3.tar.xz"; }; }; katomic = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/katomic-23.08.2.tar.xz"; - sha256 = "0ih6v7jmgp2vpf1d2n15gc9fd246rdndswk9y3v4vgm2rk4455nd"; - name = "katomic-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/katomic-23.08.3.tar.xz"; + sha256 = "16xi82qg0wdfs4y8qkl34q46231qx3jh351y3wwzpnsrcpq9vxxp"; + name = "katomic-23.08.3.tar.xz"; }; }; kbackup = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kbackup-23.08.2.tar.xz"; - sha256 = "1yxdf7c0g2vvv71yy0qq07g32zzzkac71yk3qh371k80cr57qq2w"; - name = "kbackup-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kbackup-23.08.3.tar.xz"; + sha256 = "1d1bsbm4zkxlxjbk9p2ndix1ly4k7vjm94v0pfy057j21djiqb0b"; + name = "kbackup-23.08.3.tar.xz"; }; }; kblackbox = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kblackbox-23.08.2.tar.xz"; - sha256 = "0i6w8l71l6yfkq5dvsqnyi7767pjwa5basbq3ama6zcziqlkcn12"; - name = "kblackbox-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kblackbox-23.08.3.tar.xz"; + sha256 = "047g9h5nz9awdpg9ha3qi7l0ybs77qwjgw0628ac33klxlz0y60p"; + name = "kblackbox-23.08.3.tar.xz"; }; }; kblocks = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kblocks-23.08.2.tar.xz"; - sha256 = "0fc9gszrnrji6hpybcfcija21hyghkssp44fd6iz35ja0fk7yp64"; - name = "kblocks-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kblocks-23.08.3.tar.xz"; + sha256 = "13yw8pdvnn3944x6cqxbiwllphyjynan57f215000f4gpvj8ncmc"; + name = "kblocks-23.08.3.tar.xz"; }; }; kbounce = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kbounce-23.08.2.tar.xz"; - sha256 = "0w6acsjjjw862grqvq2627ks0bpfgip46hrzs7lapbwdszwyzmhz"; - name = "kbounce-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kbounce-23.08.3.tar.xz"; + sha256 = "129724ks0cd5689wihyhds3rb6rai8bp4wajqihn3qidpq7h3dqp"; + name = "kbounce-23.08.3.tar.xz"; }; }; kbreakout = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kbreakout-23.08.2.tar.xz"; - sha256 = "1dkw9bbgl5xa9rr1q1kr6133ml4897v54mshvsz81v2hmgx13cs3"; - name = "kbreakout-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kbreakout-23.08.3.tar.xz"; + sha256 = "1pnkwgxmy02ggxxzx1cxhvvghvz37kwvkw70gd2d98ma143b97xq"; + name = "kbreakout-23.08.3.tar.xz"; }; }; kbruch = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kbruch-23.08.2.tar.xz"; - sha256 = "1h2vcna88km06gazlm35jnn8qpa15zzqp3yzll8qlvz3nch9ljdg"; - name = "kbruch-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kbruch-23.08.3.tar.xz"; + sha256 = "0pg4q9si6s43dja3nl8fr73cfy568xxbq3d9j4am1bl0jpwlsyjb"; + name = "kbruch-23.08.3.tar.xz"; }; }; kcachegrind = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcachegrind-23.08.2.tar.xz"; - sha256 = "0wbdjc8x8ja81611kgp4sf500i7c0jgb2q937hji3k9dg9di554s"; - name = "kcachegrind-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcachegrind-23.08.3.tar.xz"; + sha256 = "0zy2fp31bq0688njpk54dd51vd7fm4ph5x0jdygbr8w9pg7r5vlz"; + name = "kcachegrind-23.08.3.tar.xz"; }; }; kcalc = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcalc-23.08.2.tar.xz"; - sha256 = "0l0zn2fnaz0kvzjzn37n1ij7ad5sg8q59qxjg8rax217qg92vsp3"; - name = "kcalc-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcalc-23.08.3.tar.xz"; + sha256 = "0f3nq88ifzcw7yjcalcn4xbg12rn11fsddgd8gbaxhqilxf7ggkr"; + name = "kcalc-23.08.3.tar.xz"; }; }; kcalutils = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcalutils-23.08.2.tar.xz"; - sha256 = "1mizpwv9q5cf94bpd4mbh1wykji74ilkpdak27hnwddc5jgqnry7"; - name = "kcalutils-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcalutils-23.08.3.tar.xz"; + sha256 = "1c1ifc11y0a25k2aiczl0mwpnc87y9m2vawwjcshzp04k9yfl88p"; + name = "kcalutils-23.08.3.tar.xz"; }; }; kcharselect = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcharselect-23.08.2.tar.xz"; - sha256 = "1m6ssvrmck011775rc2iw8phxgdm20zjwnyjd1glgp2ryi4599jn"; - name = "kcharselect-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcharselect-23.08.3.tar.xz"; + sha256 = "02zaq8w4a1sq67jn5swfrsnwh2rjlizkcr4xv1j1jy6cmvl7s9k6"; + name = "kcharselect-23.08.3.tar.xz"; }; }; kclock = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kclock-23.08.2.tar.xz"; - sha256 = "0hdf7fpac9kxcl8pk4pnchs8fl9ks96zw4la9rch0l98ckpg995b"; - name = "kclock-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kclock-23.08.3.tar.xz"; + sha256 = "0h932w0lfd9aq7n3p2ny375qbnqsa9hk1sq0mz1sgj7csb5y924i"; + name = "kclock-23.08.3.tar.xz"; }; }; kcolorchooser = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcolorchooser-23.08.2.tar.xz"; - sha256 = "115hzkkbj1jhyr13fgn7im1xpz76l3sjk7injh49pigg1mk23xxr"; - name = "kcolorchooser-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcolorchooser-23.08.3.tar.xz"; + sha256 = "07zv0vvwdgf68ay07adp0hcgw1y5xasfm5kf82rr0khiqwmm2qal"; + name = "kcolorchooser-23.08.3.tar.xz"; }; }; kcron = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kcron-23.08.2.tar.xz"; - sha256 = "05sqn0kdam2z1gyv0yk3147hbjzw6zpka5r38b7v6qzjj8avc46l"; - name = "kcron-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kcron-23.08.3.tar.xz"; + sha256 = "1vbyp2g6p5bgzwbp72aa9zsdwnhr2r4jvpa626j31hh58hxdj0c3"; + name = "kcron-23.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kde-dev-scripts-23.08.2.tar.xz"; - sha256 = "0n77cqa45zx901w0nqc7bpgkrfbw26sgs7w0789ff998iikg3ys5"; - name = "kde-dev-scripts-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kde-dev-scripts-23.08.3.tar.xz"; + sha256 = "0m3f5wyp01128yhni6g5idihhli3zbn0mw60c1wkbr81k0drb71x"; + name = "kde-dev-scripts-23.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kde-dev-utils-23.08.2.tar.xz"; - sha256 = "19r40rpq1jp3lxhhb5jw5aja02dda813149c2cla6aqvd2g9fmlq"; - name = "kde-dev-utils-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kde-dev-utils-23.08.3.tar.xz"; + sha256 = "04sfqlf1b7lkpd0d5wifiq253fcl3ba38gnvwyw6jmlgsajaapm4"; + name = "kde-dev-utils-23.08.3.tar.xz"; }; }; kde-inotify-survey = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kde-inotify-survey-23.08.2.tar.xz"; - sha256 = "1v1x4c4i2bswzl81f4rwa4p1y3cpih1vb0w2rg9mq0av4aidnbkz"; - name = "kde-inotify-survey-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kde-inotify-survey-23.08.3.tar.xz"; + sha256 = "1b2hplri9s6h26csf2hyp25gffk1mzz4kaxwq7ssjhwswg251qqc"; + name = "kde-inotify-survey-23.08.3.tar.xz"; }; }; kdebugsettings = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdebugsettings-23.08.2.tar.xz"; - sha256 = "1iwnw08nf3z5w2zckg311xj99gix3nf98wg2ksdjlmkkz8rw6df1"; - name = "kdebugsettings-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdebugsettings-23.08.3.tar.xz"; + sha256 = "1fm4bzgrg501v99hx0plkfvkw13ynlc9k1xsq1mi0dx4kx53rkbi"; + name = "kdebugsettings-23.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdeconnect-kde-23.08.2.tar.xz"; - sha256 = "1div06qdg902bmylbpza4kcqky04c0vzinn0a0k6pqvpmj51nqin"; - name = "kdeconnect-kde-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdeconnect-kde-23.08.3.tar.xz"; + sha256 = "01i9palhzsa0f2cypwi0ik6lc37p7hx1h1zlz5ly1q70n8amx3xr"; + name = "kdeconnect-kde-23.08.3.tar.xz"; }; }; kdeedu-data = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdeedu-data-23.08.2.tar.xz"; - sha256 = "16dw83xkcvrdwgljj5yjrkba29n8kn7sc3mfbzzkfdy32fd16a5f"; - name = "kdeedu-data-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdeedu-data-23.08.3.tar.xz"; + sha256 = "0x32hqb6fixk53fv5g29jjq1bk0svv4i9yb51amgscbqf0aircf9"; + name = "kdeedu-data-23.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdegraphics-mobipocket-23.08.2.tar.xz"; - sha256 = "1dvlfhk9v0bxh9h6kvpjq9jz6bjw04j1nqxfkjgm31cbj5207x0a"; - name = "kdegraphics-mobipocket-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdegraphics-mobipocket-23.08.3.tar.xz"; + sha256 = "11vlmkaqypnjsvgvrma22qy5vq5mjcyz71y2glbbdjvmld61s91s"; + name = "kdegraphics-mobipocket-23.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdegraphics-thumbnailers-23.08.2.tar.xz"; - sha256 = "1h7xdr6ycqvy5l6fdfybxlzck6k7vmrcr57gkx3jxpl7yawqzphz"; - name = "kdegraphics-thumbnailers-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdegraphics-thumbnailers-23.08.3.tar.xz"; + sha256 = "1h02p2l2z28g2nnfhf57d4xjy185biwp0ym4cwpavx8xxa4sb87m"; + name = "kdegraphics-thumbnailers-23.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdenetwork-filesharing-23.08.2.tar.xz"; - sha256 = "0926vnxb9ik96yccjix1grg7c8p7vwkbg2hhpqjskdbrzi0d5kh0"; - name = "kdenetwork-filesharing-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdenetwork-filesharing-23.08.3.tar.xz"; + sha256 = "1v35g9g3h1j8l012di3fdqk0s4qcbwnlglvcbymbbrph6bsjz9m2"; + name = "kdenetwork-filesharing-23.08.3.tar.xz"; }; }; kdenlive = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdenlive-23.08.2.tar.xz"; - sha256 = "11wv2k44ia8wbmcskgdjl13p564wxhr7ad8la2kzbd2kck6m0hzn"; - name = "kdenlive-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdenlive-23.08.3.tar.xz"; + sha256 = "13rfbj01xdiskwld1liys5y0har2wnxqxfb2wglm0bafcsjciv47"; + name = "kdenlive-23.08.3.tar.xz"; }; }; kdepim-addons = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdepim-addons-23.08.2.tar.xz"; - sha256 = "12z64iajmqwv3644qpj7rv8cskj709nh2qlqdhvncwafwv63i9bd"; - name = "kdepim-addons-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdepim-addons-23.08.3.tar.xz"; + sha256 = "1pa091c978ram37p7a5kzmcv5b6mw9il7kz12hzad10sj6vkx106"; + name = "kdepim-addons-23.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdepim-runtime-23.08.2.tar.xz"; - sha256 = "115dvvygy2niaj47x7l5hxmldf22bmj61dp3k32sa91x1xvsyxah"; - name = "kdepim-runtime-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdepim-runtime-23.08.3.tar.xz"; + sha256 = "06vbachvqa92idzxpcxj3z943089iqq6db5w90nwfda5bg1v734r"; + name = "kdepim-runtime-23.08.3.tar.xz"; }; }; kdesdk-kio = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdesdk-kio-23.08.2.tar.xz"; - sha256 = "12hdlpi2vx54hnfg4l6jzsr28236zy3nl31ki71sdhzfaj9hk8da"; - name = "kdesdk-kio-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdesdk-kio-23.08.3.tar.xz"; + sha256 = "1895jc0kbgiysbbkjjwqx94h7xy30basybl362b72nmx1irydhw0"; + name = "kdesdk-kio-23.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdesdk-thumbnailers-23.08.2.tar.xz"; - sha256 = "1j7ykdps1vgnqmr6cwn7rvgf02wwkfv05ig4nz0saqwksfi2q5bv"; - name = "kdesdk-thumbnailers-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdesdk-thumbnailers-23.08.3.tar.xz"; + sha256 = "09hd7xi2sw7mhc41k845igvpncfkq7rabbr92gh33fx3fi2bq0k5"; + name = "kdesdk-thumbnailers-23.08.3.tar.xz"; }; }; kdev-php = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdev-php-23.08.2.tar.xz"; - sha256 = "189q83jjwy6i3bdwizibjxrwx39wcz9ynpqlhvvx46pc01dmlgll"; - name = "kdev-php-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdev-php-23.08.3.tar.xz"; + sha256 = "1vxafw6i3yp9dcccv447b1yjhm3wssyysbx99c4564j6q43bizvr"; + name = "kdev-php-23.08.3.tar.xz"; }; }; kdev-python = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdev-python-23.08.2.tar.xz"; - sha256 = "18j1bv09wfgz5bwc2linhgvjvkcx0r7ir1nfkg6v8wa2r7wgj264"; - name = "kdev-python-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdev-python-23.08.3.tar.xz"; + sha256 = "1n2vcw01mfmvjxswp9j9qj5w9sxlmshpmjp28dscnksqlmgvyk8c"; + name = "kdev-python-23.08.3.tar.xz"; }; }; kdevelop = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdevelop-23.08.2.tar.xz"; - sha256 = "04y5khhgsm02x40ljf5dx21v9s8nhsc6czksk1lf1g6nn3p1axsp"; - name = "kdevelop-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdevelop-23.08.3.tar.xz"; + sha256 = "1zimkfvpipkc6py6zxrxvdnznjm29s9qwkskk2x6nckrj0zikk0r"; + name = "kdevelop-23.08.3.tar.xz"; }; }; kdf = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdf-23.08.2.tar.xz"; - sha256 = "10a81hmhrbn3pa000v0r2qk6lyg9dv6478vv1q922hzvmp2f52ch"; - name = "kdf-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdf-23.08.3.tar.xz"; + sha256 = "118fcs26qdjm08r2qz86gx5kwgqfgn07f3j6b30hrfvfrxsyi63b"; + name = "kdf-23.08.3.tar.xz"; }; }; kdialog = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdialog-23.08.2.tar.xz"; - sha256 = "1wpx0v9z1avnz74js64nlrcp79gkjfhcpky56zjw00a8qvhxi1i6"; - name = "kdialog-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdialog-23.08.3.tar.xz"; + sha256 = "0nm8zx44y0g6hc101lfbybdilhvblpx8v9hz8qb1mixac9mg69fz"; + name = "kdialog-23.08.3.tar.xz"; }; }; kdiamond = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kdiamond-23.08.2.tar.xz"; - sha256 = "12zgh7119hn48viiavi7jdzfqywa0mz5l6xxgc7pl3wdjc525jw8"; - name = "kdiamond-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kdiamond-23.08.3.tar.xz"; + sha256 = "13z4p5qasqvj9fbif40lxva8nl1z9ccy4wgrk9z429h4gz14gms0"; + name = "kdiamond-23.08.3.tar.xz"; }; }; keditbookmarks = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/keditbookmarks-23.08.2.tar.xz"; - sha256 = "0jckdxxsv81lm3459xk9mzc8nfpis8k11j8w2ykjw6w9z7ixny0m"; - name = "keditbookmarks-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/keditbookmarks-23.08.3.tar.xz"; + sha256 = "16ff8sh9dbrwpnciny75n5a9zy4mzb7k0r6q1di0qyc7fsbsx5xh"; + name = "keditbookmarks-23.08.3.tar.xz"; }; }; keysmith = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/keysmith-23.08.2.tar.xz"; - sha256 = "1r55cd2bpf9pq4ry4y0hn8kaq44l49s2gd7xbpaxxbxbpnyl08dm"; - name = "keysmith-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/keysmith-23.08.3.tar.xz"; + sha256 = "0bc9ywphfcg526izx9g39wwfs9kqp78xw7asngdmnb9mlpyiqc6d"; + name = "keysmith-23.08.3.tar.xz"; }; }; kfind = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kfind-23.08.2.tar.xz"; - sha256 = "09wjx1i01rylxrwx92bk8h5m7l64js809kc5rl7qm24qy77y04rg"; - name = "kfind-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kfind-23.08.3.tar.xz"; + sha256 = "1rs50199j1xgzd6nr48hn4f254avv2jajkg6yldcpigjb6y62bpa"; + name = "kfind-23.08.3.tar.xz"; }; }; kfourinline = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kfourinline-23.08.2.tar.xz"; - sha256 = "1pdcgckwxppwr19ghgzww6qzd18af17qbznximr8g5drvyhfxz6c"; - name = "kfourinline-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kfourinline-23.08.3.tar.xz"; + sha256 = "1n9svckg4x463rliby8amyrhrihl55p1h4kk5lkn7hfa58irs59n"; + name = "kfourinline-23.08.3.tar.xz"; }; }; kgeography = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kgeography-23.08.2.tar.xz"; - sha256 = "0nwj2vv0sxwc3qhqlm50ikkh5df8prwj8x2xgcsc0nldpy7qhsrw"; - name = "kgeography-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kgeography-23.08.3.tar.xz"; + sha256 = "18q7jc76g279hcdqy0bsiwq0wpssr545m31spnji3v3cfyg21w2g"; + name = "kgeography-23.08.3.tar.xz"; }; }; kget = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kget-23.08.2.tar.xz"; - sha256 = "0yplslzz57n0j9228ljmdm5f1y11lm9gifaa721rx1rpb8z7ll56"; - name = "kget-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kget-23.08.3.tar.xz"; + sha256 = "1cdb3w6941c6agasjzmk58lgviks2phk9w321p1yw2g6v4prb81g"; + name = "kget-23.08.3.tar.xz"; }; }; kgoldrunner = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kgoldrunner-23.08.2.tar.xz"; - sha256 = "1ipaam97l24gicj169ksl0vc5qyl3wrcqmsbjpzy48jcqh2czy5i"; - name = "kgoldrunner-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kgoldrunner-23.08.3.tar.xz"; + sha256 = "1ivx443a807rbbl179pid04am1s3qcmdrkf90pgpf1y85mf52gw4"; + name = "kgoldrunner-23.08.3.tar.xz"; }; }; kgpg = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kgpg-23.08.2.tar.xz"; - sha256 = "1xq0j77hh6a9vaqpba0xmi6sl13kc1p28liirg5yaalzhyrb9rsd"; - name = "kgpg-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kgpg-23.08.3.tar.xz"; + sha256 = "0fn44ikpj1f1cniivq3k32248pmcf7ir54dpwzlfa0xn9cgr5b6r"; + name = "kgpg-23.08.3.tar.xz"; }; }; khangman = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/khangman-23.08.2.tar.xz"; - sha256 = "0bh5rygsflr5ark71sm20fsa8n8b92995r4snqwd4c5m3p5v79qy"; - name = "khangman-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/khangman-23.08.3.tar.xz"; + sha256 = "0cj46h6px8i1s1qianc7ypa0xzchv9dbv88c85igl7jaw3l8vyiz"; + name = "khangman-23.08.3.tar.xz"; }; }; khelpcenter = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/khelpcenter-23.08.2.tar.xz"; - sha256 = "1jzcfy2y2y2ynpvvkxncpnnr0sgcqyg3nw4cnlx8g9c4h00719b5"; - name = "khelpcenter-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/khelpcenter-23.08.3.tar.xz"; + sha256 = "0ppsif19kchz8k2ww2nc1wqqri6zq93cg36j6iydg61qiilf4grv"; + name = "khelpcenter-23.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kidentitymanagement-23.08.2.tar.xz"; - sha256 = "1zjrr7v6n7bfv6z8139z099l0pxi0hx248z0cr5xkjwgjlywnjqk"; - name = "kidentitymanagement-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kidentitymanagement-23.08.3.tar.xz"; + sha256 = "1pfvmbij90v626spb123hdgxzdpvx1r64pkx540g40fp5nw86d3z"; + name = "kidentitymanagement-23.08.3.tar.xz"; }; }; kig = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kig-23.08.2.tar.xz"; - sha256 = "13qj0fza5k3k7fjp8kmi7n2jxkfwpsl4igah01yx9qrwqka193f9"; - name = "kig-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kig-23.08.3.tar.xz"; + sha256 = "09lfcxs4qnj36vcm7flvf8ay7cgmbs5nwq1ranzk7n82gs6f96n9"; + name = "kig-23.08.3.tar.xz"; }; }; kigo = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kigo-23.08.2.tar.xz"; - sha256 = "1r5j5il2shv3g0iiicpvgj86bcs5dz9k0vwphqw55caybzdxmsj3"; - name = "kigo-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kigo-23.08.3.tar.xz"; + sha256 = "1asplm2rdppqkl6l1j9d97k081c2j7zlckbk0j4wkkyqgh2pgf00"; + name = "kigo-23.08.3.tar.xz"; }; }; killbots = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/killbots-23.08.2.tar.xz"; - sha256 = "0bg8n8ygryx08ir5ahznch2jh1dzgcv0sfmk76h4zhbrgvfd7y4m"; - name = "killbots-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/killbots-23.08.3.tar.xz"; + sha256 = "0v2zblvcv1r1by33icp4lakzjx4f87d2pcaxh99nvv3frq6y7ic9"; + name = "killbots-23.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kimagemapeditor-23.08.2.tar.xz"; - sha256 = "1jrz1mnrf8wyywpsvy0cl384xihwsi0zx8d4x6axa919bgjrcvfj"; - name = "kimagemapeditor-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kimagemapeditor-23.08.3.tar.xz"; + sha256 = "138dd5h1664akiwd0svsayyymjsg3brchwhvdyrfig9xx878s43p"; + name = "kimagemapeditor-23.08.3.tar.xz"; }; }; kimap = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kimap-23.08.2.tar.xz"; - sha256 = "1hv7vr4cv6mh28fw7b6s1vl12nyv7cr2pwy1lz412q3w1g6vknmf"; - name = "kimap-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kimap-23.08.3.tar.xz"; + sha256 = "1wym8sppd89sncm2f40zaxrzhmipq49g4vm5zw97cixkln0xlw0l"; + name = "kimap-23.08.3.tar.xz"; }; }; kio-admin = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kio-admin-23.08.2.tar.xz"; - sha256 = "0z1cb3g7av57zhn3a0r8v9xp2043p23kq4mypxmx5sd1mrwklvc0"; - name = "kio-admin-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kio-admin-23.08.3.tar.xz"; + sha256 = "1a3r00sx1hvgbapd0m4v122cc24bkh2yxmnshdl73fm6sqdk1c6i"; + name = "kio-admin-23.08.3.tar.xz"; }; }; kio-extras = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kio-extras-23.08.2.tar.xz"; - sha256 = "0hyc9zljf32s8k7zf88gwrks5pnaycxg1b7fk2znsa474m1wd61b"; - name = "kio-extras-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kio-extras-23.08.3.tar.xz"; + sha256 = "1nnnv14105rvgqa5ad8b4nnafhy7cq7bpk5jqbf63jb87074sih6"; + name = "kio-extras-23.08.3.tar.xz"; }; }; kio-gdrive = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kio-gdrive-23.08.2.tar.xz"; - sha256 = "0zs8d9vslkxsxbb2g507vb7nx8xbhgdfhrv0ywwy50ds274x624c"; - name = "kio-gdrive-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kio-gdrive-23.08.3.tar.xz"; + sha256 = "1pwd6lpa5vvbar2mz94xhwhwlds4hm0l6f8lx4y79h6d3wv50mhm"; + name = "kio-gdrive-23.08.3.tar.xz"; }; }; kio-zeroconf = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kio-zeroconf-23.08.2.tar.xz"; - sha256 = "1sywxlfw0yl872zrl7fn4zwwnkq75q0xh04y26x8azqzqh2lvzwm"; - name = "kio-zeroconf-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kio-zeroconf-23.08.3.tar.xz"; + sha256 = "0f87k0v04p7pjv325qw425vs9vwfm1mmjljbcjq67afh666p8zdm"; + name = "kio-zeroconf-23.08.3.tar.xz"; }; }; kipi-plugins = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kipi-plugins-23.08.2.tar.xz"; - sha256 = "0adfd9mgv4xbwafj3v6hiin3j7j20qnj1dyr8mcyxfrmb34kda5f"; - name = "kipi-plugins-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kipi-plugins-23.08.3.tar.xz"; + sha256 = "1d5kh2iqvms8kfls0hjpp55pyll5qvzn3bxggy4ihjba12kwrq1c"; + name = "kipi-plugins-23.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kirigami-gallery-23.08.2.tar.xz"; - sha256 = "070q5yljw001160675zz80wh138582irwzhw6a25341h6cq9byrz"; - name = "kirigami-gallery-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kirigami-gallery-23.08.3.tar.xz"; + sha256 = "0br35c5v4mz8nbqrqd0pagdr2gv88p0qh11ansadgkalwmgs283f"; + name = "kirigami-gallery-23.08.3.tar.xz"; }; }; kiriki = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kiriki-23.08.2.tar.xz"; - sha256 = "03yaadf6sj2av58vn60gjcw3lrinpikm3vp59wmnc5nhnfji1m5b"; - name = "kiriki-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kiriki-23.08.3.tar.xz"; + sha256 = "1af6a6cghdak9wwx518q8wqyi8bylisy3gdlqfg2n5k1vq9ma1nr"; + name = "kiriki-23.08.3.tar.xz"; }; }; kiten = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kiten-23.08.2.tar.xz"; - sha256 = "1cb8j3ssgfmvxlfa28dyxawng7z6cjzqpwkxwh9s4xym52nvz1iv"; - name = "kiten-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kiten-23.08.3.tar.xz"; + sha256 = "0ysrh6437sd5zqj76j6a1nz3q8cwqx4nqqijwnc75jdqd5w3aii7"; + name = "kiten-23.08.3.tar.xz"; }; }; kitinerary = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kitinerary-23.08.2.tar.xz"; - sha256 = "0zmlv1wr2z9xbk53dwiwnqcpgm026gc0mmdfpp9flas403za7gcr"; - name = "kitinerary-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kitinerary-23.08.3.tar.xz"; + sha256 = "164xixh9lxp9kyx08pf2p2qbdl28800x7hvvnvkmy79bvsqvpr7l"; + name = "kitinerary-23.08.3.tar.xz"; }; }; kjournald = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kjournald-23.08.2.tar.xz"; - sha256 = "0620sd7x3lfcabnwnh6azpqkr67r6rbaphbdzbzzkphqpnms38s4"; - name = "kjournald-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kjournald-23.08.3.tar.xz"; + sha256 = "0xz903wfi85g338advs46sn7fpdrcmy731gqp4dhpcrly8amvbzi"; + name = "kjournald-23.08.3.tar.xz"; }; }; kjumpingcube = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kjumpingcube-23.08.2.tar.xz"; - sha256 = "1wcxxhcr130r4f4jf243xagiz3d7a7k5ardgyd9swnmf3y2d4y62"; - name = "kjumpingcube-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kjumpingcube-23.08.3.tar.xz"; + sha256 = "19k3wah2x4y3z950y70i9vkqwnlrnsdj71rrz8yxv29i0c4kdywd"; + name = "kjumpingcube-23.08.3.tar.xz"; }; }; kldap = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kldap-23.08.2.tar.xz"; - sha256 = "00ydb3b1cn0hv869l4y9i8kl18nvkhsap2nl0lbkhdxy79f4gi5d"; - name = "kldap-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kldap-23.08.3.tar.xz"; + sha256 = "1xz1fjvlal6y1ciakzsgqkivsi092rj6xvbmgp3pp4h7f2pwhnz5"; + name = "kldap-23.08.3.tar.xz"; }; }; kleopatra = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kleopatra-23.08.2.tar.xz"; - sha256 = "0ya6sq6qp1fb3aqjf32dcnbk7yaj0jihxwb4x5yriw1s1l1j7h7k"; - name = "kleopatra-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kleopatra-23.08.3.tar.xz"; + sha256 = "0ga3hs89g5dd6kf6xdfnr9srswf1dzis2dfm8jkah7czfmcfns28"; + name = "kleopatra-23.08.3.tar.xz"; }; }; klettres = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/klettres-23.08.2.tar.xz"; - sha256 = "0cbmz77finbix8l7z986v5770dnp4i6sv6jrs8aw0x23b66qzyd1"; - name = "klettres-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/klettres-23.08.3.tar.xz"; + sha256 = "1vvs8a0npf9dy5778jjyvbg0jpbgjz1ysf3ckg9v8n5qr211v1cp"; + name = "klettres-23.08.3.tar.xz"; }; }; klickety = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/klickety-23.08.2.tar.xz"; - sha256 = "06r7nlgy6hr6xdxanzaww2c2459pm2kaf5b0y0zrc0p4jiw2cxz3"; - name = "klickety-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/klickety-23.08.3.tar.xz"; + sha256 = "0kwaiab8cm1azc34l50gw0kjm2zx8j4pjqyi58829xrvvh3rf8lq"; + name = "klickety-23.08.3.tar.xz"; }; }; klines = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/klines-23.08.2.tar.xz"; - sha256 = "0yd5w6nibgjvzsxba5zs5jbr8pxnwwcpwxhh2jwjympvdp2g1l9q"; - name = "klines-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/klines-23.08.3.tar.xz"; + sha256 = "1qaw6rrd1az91sk3siij9a6fhcgl1y42m5v39497468y5iabc92j"; + name = "klines-23.08.3.tar.xz"; }; }; kmag = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmag-23.08.2.tar.xz"; - sha256 = "1qgxc15fkksv7kknjcj286265yz2rdza1vafwbb3vn7wxmkgqb0n"; - name = "kmag-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmag-23.08.3.tar.xz"; + sha256 = "0s978ixr19cd9jkd2j47c8ppb6j22w3wjyyvn5h5n09shr2sw2fx"; + name = "kmag-23.08.3.tar.xz"; }; }; kmahjongg = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmahjongg-23.08.2.tar.xz"; - sha256 = "1lrff6837vp949r9ps1wfrj2y98msmmnn9d0lyxrzz3zagss2imi"; - name = "kmahjongg-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmahjongg-23.08.3.tar.xz"; + sha256 = "1di8nib9k7f2d3afbbp12qmk377fah4b0vqwmj8i0ahhw7a1ydgs"; + name = "kmahjongg-23.08.3.tar.xz"; }; }; kmail = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmail-23.08.2.tar.xz"; - sha256 = "1xxlw6h1bzv03k2bgv7qhmfglnwdkacw9ycw0hbq7hmz9mwk7lvh"; - name = "kmail-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmail-23.08.3.tar.xz"; + sha256 = "01vjh1icad7ymcm2nqwss4b61a09mw7f6gzwqyzyc1x6f38908hv"; + name = "kmail-23.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmail-account-wizard-23.08.2.tar.xz"; - sha256 = "06bjk1mzqjv1w7c1ldxw3v711kfq80qb8902h03fl7k7bzq6zfmx"; - name = "kmail-account-wizard-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmail-account-wizard-23.08.3.tar.xz"; + sha256 = "193f700lk0j5ci5x8y10d5lnd30lk4p4idyspznskqfs6sranshq"; + name = "kmail-account-wizard-23.08.3.tar.xz"; }; }; kmailtransport = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmailtransport-23.08.2.tar.xz"; - sha256 = "1j6jmcb2k98d1xy7zd9dc6r0dqhqrizfkr8bi2qainw5d4hckvmp"; - name = "kmailtransport-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmailtransport-23.08.3.tar.xz"; + sha256 = "18a8i2cffqdwgb7bvyayzrfp8l9zhhl3z0728bn51drw53c2pprp"; + name = "kmailtransport-23.08.3.tar.xz"; }; }; kmbox = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmbox-23.08.2.tar.xz"; - sha256 = "1qnc6hsdzh6qb4amyywf837jyv0xv5wvhm94w6c5hbzl4c9lviab"; - name = "kmbox-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmbox-23.08.3.tar.xz"; + sha256 = "1884av5dxz6d59z9abdbji9w7yyl02r51lrarna85iwy2pxpiq4j"; + name = "kmbox-23.08.3.tar.xz"; }; }; kmime = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmime-23.08.2.tar.xz"; - sha256 = "0k6jnyj1sy7hmdqh5q7xbajrxrhp0h6hh2jnln77p88p7rxnmzhg"; - name = "kmime-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmime-23.08.3.tar.xz"; + sha256 = "1c9kkw1cmzlkmzg93pj0v3h4wd9gkna4xhi24774pwsxi06chl8s"; + name = "kmime-23.08.3.tar.xz"; }; }; kmines = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmines-23.08.2.tar.xz"; - sha256 = "0p2xdwxmx9vkvwsq9j2qa1zzsyvw432ssb4fxjsx02a50v4207dp"; - name = "kmines-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmines-23.08.3.tar.xz"; + sha256 = "0g1r2cx50fy0p5p7v7yydq9sn1kj4ahidqv3dfwwcy5lssgs6q6j"; + name = "kmines-23.08.3.tar.xz"; }; }; kmix = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmix-23.08.2.tar.xz"; - sha256 = "04cjsdw6xp2m9z9fszl2z4mcnwqh528difg2rkqmr8aj8w9k8dih"; - name = "kmix-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmix-23.08.3.tar.xz"; + sha256 = "0ddcb0gmjsw3k5by8i3b23c4gb8933blpqx74vx4b9crbv364x3m"; + name = "kmix-23.08.3.tar.xz"; }; }; kmousetool = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmousetool-23.08.2.tar.xz"; - sha256 = "0v6307y6626q1qvdqs93zirygggcmhf4wsgm2aqy9zjpn83d6rn2"; - name = "kmousetool-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmousetool-23.08.3.tar.xz"; + sha256 = "05xq14sc3n07kyq4nys0270pc1nxjvd7v2jxrfna621kdr8mvv7n"; + name = "kmousetool-23.08.3.tar.xz"; }; }; kmouth = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmouth-23.08.2.tar.xz"; - sha256 = "1cjqcmpbn5g92fv5k818a5hazbjq5y8l2liy8b7ysj22y4ygn8c8"; - name = "kmouth-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmouth-23.08.3.tar.xz"; + sha256 = "0fqmrccd0pfn8pjfnaq5pk1xzns4v6y2vkfvv07lkpdnzj0mx7s1"; + name = "kmouth-23.08.3.tar.xz"; }; }; kmplot = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kmplot-23.08.2.tar.xz"; - sha256 = "010d2m9jdfdd12dvb7hxp0rqw50ckzybpvhgydmaw172v0pymyag"; - name = "kmplot-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kmplot-23.08.3.tar.xz"; + sha256 = "1sjw598jncfbmpscq71fh4l8w932d1p77jkqp70d32az36xrnns5"; + name = "kmplot-23.08.3.tar.xz"; }; }; knavalbattle = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/knavalbattle-23.08.2.tar.xz"; - sha256 = "0ycpc6d2n230h3pf6l68xbszga7sscf6p6l6dq6qvcmdmf4801qv"; - name = "knavalbattle-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/knavalbattle-23.08.3.tar.xz"; + sha256 = "1mjk27k9h9i2sb2li97hnzjirgji1z7kv7al5c7m5r4j8jz6jzyy"; + name = "knavalbattle-23.08.3.tar.xz"; }; }; knetwalk = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/knetwalk-23.08.2.tar.xz"; - sha256 = "1kh5kv8ii4yfhf8763pwlzx85ifhc44nq46hyb1dh5dyjnix784x"; - name = "knetwalk-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/knetwalk-23.08.3.tar.xz"; + sha256 = "1mg9hjvrqj8ksp79hkw3rpx16swmr8l2xxkmsx3vczdk2hi46gbr"; + name = "knetwalk-23.08.3.tar.xz"; }; }; knights = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/knights-23.08.2.tar.xz"; - sha256 = "11mbwydwv8in80g48110yszpzp0m0hjmqdq6w3x0j1rpzc9l5rr1"; - name = "knights-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/knights-23.08.3.tar.xz"; + sha256 = "0yjigwqyzj3ph56zvlddfjmiwzssrq9lar6ipzga5k2anwdfgv6j"; + name = "knights-23.08.3.tar.xz"; }; }; knotes = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/knotes-23.08.2.tar.xz"; - sha256 = "1005g4ffagkqp4mdw2r8jmw5ci2frgshql6a9ak1adk4jrcyaniq"; - name = "knotes-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/knotes-23.08.3.tar.xz"; + sha256 = "1d24j7qyizvppzmrz25w08gghx37cdrsmb4gzy3vsvamx9r8cjda"; + name = "knotes-23.08.3.tar.xz"; }; }; koko = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/koko-23.08.2.tar.xz"; - sha256 = "10i2hcvli1v8fn606zqip3ah5iszznbv6jr4x6m8g35p1d6k939p"; - name = "koko-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/koko-23.08.3.tar.xz"; + sha256 = "0lk1ik63rbdh7dj4g3y6m6ck44gc1rx526zn94cjm6ii7g7xlvfy"; + name = "koko-23.08.3.tar.xz"; }; }; kolf = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kolf-23.08.2.tar.xz"; - sha256 = "1rg1sv6qqsib7viy11l9lj9j836dcq972zmmagnmyp4mnyv4slwx"; - name = "kolf-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kolf-23.08.3.tar.xz"; + sha256 = "16sig7wi0pg421fpbqygjacsaslvailxd4fvmwph2356lz8w059j"; + name = "kolf-23.08.3.tar.xz"; }; }; kollision = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kollision-23.08.2.tar.xz"; - sha256 = "15shmlim9dkv9cp0xzp621jrbg9xlfvcw63k93qbqwrza589pjrg"; - name = "kollision-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kollision-23.08.3.tar.xz"; + sha256 = "00cm9x81l9qwb0nq7c3mpyxc3pgn3hgrbcrwg38na1plm1ykbrfx"; + name = "kollision-23.08.3.tar.xz"; }; }; kolourpaint = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kolourpaint-23.08.2.tar.xz"; - sha256 = "1fqwjca4m2pp98k7aqwhh3b6bdfxcdxi31p6vd57ckgvpsnd5f8f"; - name = "kolourpaint-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kolourpaint-23.08.3.tar.xz"; + sha256 = "0mhj64r2hz7pqnii9gs5psmq0drjgqkj4v49kzapx7za54c5lgzg"; + name = "kolourpaint-23.08.3.tar.xz"; }; }; kompare = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kompare-23.08.2.tar.xz"; - sha256 = "184wmdbbsk15r6piiks0fnzamgvcbdnx5plpbknv9xk6k0a03x2c"; - name = "kompare-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kompare-23.08.3.tar.xz"; + sha256 = "1gcwm0c5yd20k1hxds0qjvmz27f380g42ia85b291w05q28ryip8"; + name = "kompare-23.08.3.tar.xz"; }; }; kongress = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kongress-23.08.2.tar.xz"; - sha256 = "0f3p8dwyzfjzw0xq20mk1b4j8hrx1vv1jjn7xh7w2ifzj176wga5"; - name = "kongress-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kongress-23.08.3.tar.xz"; + sha256 = "1956nirp276qmwnc60q7z482as3dhmzifw38shys651fpwl3k1yg"; + name = "kongress-23.08.3.tar.xz"; }; }; konqueror = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/konqueror-23.08.2.tar.xz"; - sha256 = "0ixzn9x79jp3cf7r1dcarmnffy3cl6z0izl5wz8k1dsjs56drl3c"; - name = "konqueror-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/konqueror-23.08.3.tar.xz"; + sha256 = "0ay4nsx3xybjmvl3r5ivmyxhx97krjz09a9pih4wdf822x79044j"; + name = "konqueror-23.08.3.tar.xz"; }; }; konquest = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/konquest-23.08.2.tar.xz"; - sha256 = "0prmr3hmb13420mmbamp36yy5vlfmj70v5rhrjdj56gmbnnr4qc5"; - name = "konquest-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/konquest-23.08.3.tar.xz"; + sha256 = "0pndf3qrvrifd0qf3viy01vw94dniwrrggw5h397dhy3hq47ibny"; + name = "konquest-23.08.3.tar.xz"; }; }; konsole = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/konsole-23.08.2.tar.xz"; - sha256 = "1879s533mfd2mlj2rnc4dqpm0nrwdyrd5d6ykjaxcz9dx98qii2i"; - name = "konsole-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/konsole-23.08.3.tar.xz"; + sha256 = "08skv0c1390v792s0zw2w6xl3jpm3qyzjd3g1mcnim0zmlq38372"; + name = "konsole-23.08.3.tar.xz"; }; }; kontact = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kontact-23.08.2.tar.xz"; - sha256 = "0px0zh3a4fyxd4vyw2r5aijrvx91zj1kkp2rffl7s3a4wjhplih0"; - name = "kontact-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kontact-23.08.3.tar.xz"; + sha256 = "16h9z3bss4k9pg178ar34vpakcqxz9w3zclgajd55wf13jk3xk92"; + name = "kontact-23.08.3.tar.xz"; }; }; kontactinterface = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kontactinterface-23.08.2.tar.xz"; - sha256 = "1m7j63j3zcngss2azwgnj2bsprcqc9a836vib6j1nd8wqfxkvdxz"; - name = "kontactinterface-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kontactinterface-23.08.3.tar.xz"; + sha256 = "0yqpjn7fdg2hcjffff6j9nnilm9phfnral3kwqwfp5y565qiq8gl"; + name = "kontactinterface-23.08.3.tar.xz"; }; }; kontrast = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kontrast-23.08.2.tar.xz"; - sha256 = "1gbhp04pynf7wy352crhrah3948vxp3iabgb001ffiyb4dzyks3q"; - name = "kontrast-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kontrast-23.08.3.tar.xz"; + sha256 = "1n6shhfbdxz77m2s0bml2br94g98fb71rwm8znj5dcrcq021w06q"; + name = "kontrast-23.08.3.tar.xz"; }; }; konversation = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/konversation-23.08.2.tar.xz"; - sha256 = "1hj8k50cjmlsswkdb98j0jdaj7brlqwldqh02ay3hx90qwazrcic"; - name = "konversation-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/konversation-23.08.3.tar.xz"; + sha256 = "1w48wcl395bg9hmpl2i4yx4r3y4jhcxwi7pzh0hrs15rblmqjsgx"; + name = "konversation-23.08.3.tar.xz"; }; }; kopeninghours = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kopeninghours-23.08.2.tar.xz"; - sha256 = "0lx23j6y56lnc1v5giffjkp601yc8jhp087sp444v81fxzxr5j6c"; - name = "kopeninghours-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kopeninghours-23.08.3.tar.xz"; + sha256 = "0qz57nfb84y49fbcjx9m57qcbg02pdxzskvldim2dv2rc9ppl2kf"; + name = "kopeninghours-23.08.3.tar.xz"; }; }; kopete = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kopete-23.08.2.tar.xz"; - sha256 = "0g62fxkv24a0m20yyzpc6l5hgqa6d5icjd7k4y6ikmhnrqz8iv21"; - name = "kopete-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kopete-23.08.3.tar.xz"; + sha256 = "10dx8if755y9chrsqf257854aq35rs4hcxb9zfmzm0cazfxj03jc"; + name = "kopete-23.08.3.tar.xz"; }; }; korganizer = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/korganizer-23.08.2.tar.xz"; - sha256 = "1c58jdpcgm1m56744ccc7q9a9fa4sdq4cfd50j7k1zlybz61r32l"; - name = "korganizer-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/korganizer-23.08.3.tar.xz"; + sha256 = "0v16q90lj1kc8xdc9dg6cmp510zvxr64n0r67qllqdiim0vja6fj"; + name = "korganizer-23.08.3.tar.xz"; }; }; kosmindoormap = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kosmindoormap-23.08.2.tar.xz"; - sha256 = "1fp7nmv04a31yj91i0zw3ijif3bxifl8hhs0i1q55yx0psvhany9"; - name = "kosmindoormap-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kosmindoormap-23.08.3.tar.xz"; + sha256 = "1s281a1i0fjknd52ip3q1s96hfvawmzkxvkca1s8vhgv42za18bq"; + name = "kosmindoormap-23.08.3.tar.xz"; }; }; kpat = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kpat-23.08.2.tar.xz"; - sha256 = "0vkmsf6c5j86828naw0zsc1f465ds121c4nwv7i37yzsamj02n3v"; - name = "kpat-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kpat-23.08.3.tar.xz"; + sha256 = "1i6fcpqza9pdpfnalq4ijn8raz43fm8sg9881wnp8684yy7qszq5"; + name = "kpat-23.08.3.tar.xz"; }; }; kpimtextedit = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kpimtextedit-23.08.2.tar.xz"; - sha256 = "16rndb0k3yqp353fqjig6ycf0m8hys0vrmw8rdpp1jjnk9w55m8y"; - name = "kpimtextedit-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kpimtextedit-23.08.3.tar.xz"; + sha256 = "1yq4cahv72n7rzgmza59w78k1fcfhcr1364ag9gr33qbrm7p45iw"; + name = "kpimtextedit-23.08.3.tar.xz"; }; }; kpkpass = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kpkpass-23.08.2.tar.xz"; - sha256 = "0447z73gnl98lkvj30m4jbigy2l9dynagv56b30qjl4h6kbz18h7"; - name = "kpkpass-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kpkpass-23.08.3.tar.xz"; + sha256 = "1sppnafk9hyqrk5cgdybwprcnvhv29hvajiisrmggc3gai1sb87x"; + name = "kpkpass-23.08.3.tar.xz"; }; }; kpmcore = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kpmcore-23.08.2.tar.xz"; - sha256 = "0m7nm8vs7l4xcjk8wnh5appbiwwp9a4ychhr46bk0byidq5y9h1s"; - name = "kpmcore-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kpmcore-23.08.3.tar.xz"; + sha256 = "14v3dbgmrprygmjbdc62bvqc6hnki9nn29jwbxzqfb5jlfwq9ar8"; + name = "kpmcore-23.08.3.tar.xz"; }; }; kpublictransport = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kpublictransport-23.08.2.tar.xz"; - sha256 = "10ybh474qw02gj8fmgvx3sik97nn7xdzjxwgyb5p91vr70qkpf0l"; - name = "kpublictransport-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kpublictransport-23.08.3.tar.xz"; + sha256 = "1ywk9fz5vzq93mq68jzjkn7khmdyydr1qdi67yn7lrm1wp43n0z7"; + name = "kpublictransport-23.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kqtquickcharts-23.08.2.tar.xz"; - sha256 = "017ss7fxjsyw4nsh3qd6857lx8shf53sv8i9vxvz6fvssdzfmfxj"; - name = "kqtquickcharts-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kqtquickcharts-23.08.3.tar.xz"; + sha256 = "1b7g83h2dw716384cqz4njah7grpx0h33rrxn2zmhk426qy4sks3"; + name = "kqtquickcharts-23.08.3.tar.xz"; }; }; krdc = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/krdc-23.08.2.tar.xz"; - sha256 = "10jv6byr3nym5w8qsc86r4b7k7v6r54ckmh3xdzi4x7nwlyq7ghr"; - name = "krdc-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/krdc-23.08.3.tar.xz"; + sha256 = "1wkaq0w2r2v6llz25imb7qa760dif3xbbzjmj25c0x9pw2qq7v7x"; + name = "krdc-23.08.3.tar.xz"; }; }; krecorder = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/krecorder-23.08.2.tar.xz"; - sha256 = "0afcg4sjs7yiw4hsj7lx4h4r7bzkymf8agrqk6452xn94vfwhclv"; - name = "krecorder-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/krecorder-23.08.3.tar.xz"; + sha256 = "12xdq8s1996alhbb82y9qwl72cgj8xq7fgfqfg1hrl9ny36ffig0"; + name = "krecorder-23.08.3.tar.xz"; }; }; kreversi = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kreversi-23.08.2.tar.xz"; - sha256 = "0b0ccavv0klcp0wgm091vykzclqsrrxxj5bqwq9kndi5wbfl3d17"; - name = "kreversi-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kreversi-23.08.3.tar.xz"; + sha256 = "0h4nmf6gsw8x195f45rfnjpmkhh1qj238y6hwz6ifvw4d52wf6w2"; + name = "kreversi-23.08.3.tar.xz"; }; }; krfb = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/krfb-23.08.2.tar.xz"; - sha256 = "06xy9sk2wnnm2i135fj38cjfsm2s1qdhshv3diyhammlb6pls9il"; - name = "krfb-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/krfb-23.08.3.tar.xz"; + sha256 = "1qz7s3kv4ss44qsx5vbpx6lk7xaqs4p533v3gh12r6ivr783cp9j"; + name = "krfb-23.08.3.tar.xz"; }; }; kross-interpreters = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kross-interpreters-23.08.2.tar.xz"; - sha256 = "08316d6nnc6bf22wmffzxzn1dk1k6d6knb01kvf9aza9i4jf71kd"; - name = "kross-interpreters-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kross-interpreters-23.08.3.tar.xz"; + sha256 = "1l4sgxhz8j6hmxyd5l6waqavg1gkcsa25wnc3mhf2fipl2ic3xbs"; + name = "kross-interpreters-23.08.3.tar.xz"; }; }; kruler = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kruler-23.08.2.tar.xz"; - sha256 = "036cm30bs3x79zyf74axn0sw8ah618krxyfwxpcg3smikp7nc0qc"; - name = "kruler-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kruler-23.08.3.tar.xz"; + sha256 = "0j19garqdxcag2cqyz18cmzbqzg1a8w0b5lf4g5y3r7ymnwx4vjc"; + name = "kruler-23.08.3.tar.xz"; }; }; ksanecore = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksanecore-23.08.2.tar.xz"; - sha256 = "0ylv2xyk4ss9mrf531j599gmm55jxr8f9k37v831s3ahvvz69km8"; - name = "ksanecore-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksanecore-23.08.3.tar.xz"; + sha256 = "00yp2gb826cpldrzijc6pz96l6smbjjn9s3jrcaxlp2f80v5lrrb"; + name = "ksanecore-23.08.3.tar.xz"; }; }; kshisen = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kshisen-23.08.2.tar.xz"; - sha256 = "09v52l326k484j7r5y688v2g8m88pv2qi325spbmf3m59xwh7v2n"; - name = "kshisen-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kshisen-23.08.3.tar.xz"; + sha256 = "06cwa578s8ip5h9zl6gdbndk4qxyca8kwb40v8pvk1ai6iz1lmk9"; + name = "kshisen-23.08.3.tar.xz"; }; }; ksirk = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksirk-23.08.2.tar.xz"; - sha256 = "0bll1x2k7alvnsdd303wj8jq5crcawh0iy80g8y08imd8gy7dn7y"; - name = "ksirk-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksirk-23.08.3.tar.xz"; + sha256 = "1mnnj768xf43wa82dzrr1pv85l6xmvqrfxy5af3079jwdpd8frkj"; + name = "ksirk-23.08.3.tar.xz"; }; }; ksmtp = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksmtp-23.08.2.tar.xz"; - sha256 = "0r7wmqjz9ryyapblfx7cncicjq8dwfar21jdm091pcs9psqjapvv"; - name = "ksmtp-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksmtp-23.08.3.tar.xz"; + sha256 = "0jbzydrpbyw00zwnx02qfziiz61vsp3qri3yym1qn9xds83a962b"; + name = "ksmtp-23.08.3.tar.xz"; }; }; ksnakeduel = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksnakeduel-23.08.2.tar.xz"; - sha256 = "1rzvx9s8v6k9p52r6z4n6m4jg3dawzlm5wyywbvmfydmrzfjw3f1"; - name = "ksnakeduel-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksnakeduel-23.08.3.tar.xz"; + sha256 = "1x1nvl3bgbc7wdbjrdp513y5rjfh4h1dd8wjl21zp57z0w14qha7"; + name = "ksnakeduel-23.08.3.tar.xz"; }; }; kspaceduel = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kspaceduel-23.08.2.tar.xz"; - sha256 = "1ik4ryzbqbdz8n2f8j8b1asc9hdainavn24wl1bnnn106c5g168j"; - name = "kspaceduel-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kspaceduel-23.08.3.tar.xz"; + sha256 = "186mnhf18gacpzpdw50iqwzqm66xlfqcasfznlry8xwa7cj7vpki"; + name = "kspaceduel-23.08.3.tar.xz"; }; }; ksquares = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksquares-23.08.2.tar.xz"; - sha256 = "17ns6phivm131vg1k0xkkcz82w76x1r9x5x2ccalcn9w1jbn1r9v"; - name = "ksquares-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksquares-23.08.3.tar.xz"; + sha256 = "06i7h685wzjrl6gm40g8n49p9nhv0m9rxz0w8jjp728db9p8dk0k"; + name = "ksquares-23.08.3.tar.xz"; }; }; ksudoku = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksudoku-23.08.2.tar.xz"; - sha256 = "1md0pslf52z7jrkwmp7q27dhph3vb6ilvhlsk1pn9rk28hxnmv4b"; - name = "ksudoku-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksudoku-23.08.3.tar.xz"; + sha256 = "0r0s8zgzj0wqi6g1kia6pwv4jbf09kr2w4d2kz2s5pihwgqzygc9"; + name = "ksudoku-23.08.3.tar.xz"; }; }; ksystemlog = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ksystemlog-23.08.2.tar.xz"; - sha256 = "1z2sf26zcjk2q0i0zb23pf7bickdqsaqkf2nfgv9fkiqayp7rl1j"; - name = "ksystemlog-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ksystemlog-23.08.3.tar.xz"; + sha256 = "09yna6kl4c4h2zlzqqx02ndnri2rqyi3kq4zjcg0rdx77rz7j60w"; + name = "ksystemlog-23.08.3.tar.xz"; }; }; kteatime = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kteatime-23.08.2.tar.xz"; - sha256 = "03lv1adk77dwf93iffql547v5nwmqgnsc0fwzzh8s08r21i4h7dj"; - name = "kteatime-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kteatime-23.08.3.tar.xz"; + sha256 = "02ydm87488dkxh02svm2fr25v1y5ir07s454nfiza3ykvsiv919d"; + name = "kteatime-23.08.3.tar.xz"; }; }; ktimer = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktimer-23.08.2.tar.xz"; - sha256 = "0bmxxdhw7rsvpzcsi5xsd7p059cccragfmkkzhjxqq57h53wgw1g"; - name = "ktimer-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktimer-23.08.3.tar.xz"; + sha256 = "1b3gd0hmd3yry5kbrr0z0v94m43g0hb0bry821w8vfx0hnqdxfvr"; + name = "ktimer-23.08.3.tar.xz"; }; }; ktnef = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktnef-23.08.2.tar.xz"; - sha256 = "0rrb9spry66dyvs8558rw0fis8m9fmj1czklxd7alqgsr06qphca"; - name = "ktnef-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktnef-23.08.3.tar.xz"; + sha256 = "1avnpm8zmqv65l68s64b87vhs2zb8h2c9p5is6aafqpiiqjpx0rd"; + name = "ktnef-23.08.3.tar.xz"; }; }; ktorrent = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktorrent-23.08.2.tar.xz"; - sha256 = "0cq5yn0bzspbgg5c414zbshrg0r72zi9srgpndvf31iz03gws5ha"; - name = "ktorrent-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktorrent-23.08.3.tar.xz"; + sha256 = "1dasy90ijjwrkxfrrgqc3c9r2nnsjfnsmlpz8871yvfr4cmx7n68"; + name = "ktorrent-23.08.3.tar.xz"; }; }; ktouch = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktouch-23.08.2.tar.xz"; - sha256 = "1v3rhv72yn9a7yxy9b7r4x8kcfqw4zv2ynpjl3d0pdgppncjbyr8"; - name = "ktouch-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktouch-23.08.3.tar.xz"; + sha256 = "0zsswlflvbwkgv6makzvmpafnv59q2w5dp62hzawzysg80nlqnm9"; + name = "ktouch-23.08.3.tar.xz"; }; }; ktrip = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktrip-23.08.2.tar.xz"; - sha256 = "0nyp6zcr49dhg4kwixfiskq6p7w26snlr7xiaj68983086h9rqd1"; - name = "ktrip-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktrip-23.08.3.tar.xz"; + sha256 = "11dccp2mwaw29yp2fa52xm1j8hjwgbgxhgkywm5w2x9ddd2mrdwa"; + name = "ktrip-23.08.3.tar.xz"; }; }; ktuberling = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/ktuberling-23.08.2.tar.xz"; - sha256 = "1w20jsb7r423kwd1i2xyacfrrbfrgss8njwjzh1wrwrwkbjhyziy"; - name = "ktuberling-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/ktuberling-23.08.3.tar.xz"; + sha256 = "0krhznbjnaqnknldynbvi2lm0if7b2badzmfyk0zcm6zsca56dva"; + name = "ktuberling-23.08.3.tar.xz"; }; }; kturtle = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kturtle-23.08.2.tar.xz"; - sha256 = "1mmf4xxp2jwazncm4cn9glsn1mm3fsmsbl44xrnzrblqx8wr6m14"; - name = "kturtle-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kturtle-23.08.3.tar.xz"; + sha256 = "1an929zydwb2nfcysk5jpijvihwprmgy8491z6jx60hzwdsm6pqa"; + name = "kturtle-23.08.3.tar.xz"; }; }; kubrick = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kubrick-23.08.2.tar.xz"; - sha256 = "0pgr096x145l76wzjaigkzhiwyx67qf8lzli8mbfclnsp1l2fwsw"; - name = "kubrick-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kubrick-23.08.3.tar.xz"; + sha256 = "0kzh0q3k5d6cv1g3479bz4q67b2p2skakjvs1jjr2imz8gw75c42"; + name = "kubrick-23.08.3.tar.xz"; }; }; kwalletmanager = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kwalletmanager-23.08.2.tar.xz"; - sha256 = "05vcbliv4l6h759fpl0dirrvxgcy544nb51p7fbhhb8qjmdjnagv"; - name = "kwalletmanager-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kwalletmanager-23.08.3.tar.xz"; + sha256 = "0wml6z5m2qcbqw37d1mvpnbc0rnrdsp7azyzh4p1qrvz7xvjd33p"; + name = "kwalletmanager-23.08.3.tar.xz"; }; }; kwave = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kwave-23.08.2.tar.xz"; - sha256 = "1qxp6bwjddr29l6f0zn7rkkbigkkkc8pyrpcbfhsqsb5d2l4i0hr"; - name = "kwave-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kwave-23.08.3.tar.xz"; + sha256 = "0vcvcjx4jvbrxvy6ys8jy0p85inia66lhnj5c6zf7hjyb4kyd9wd"; + name = "kwave-23.08.3.tar.xz"; }; }; kweather = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kweather-23.08.2.tar.xz"; - sha256 = "1zv8klz8axpc18gh60l2zyxwisnya5qb9vr943q306k7g1iqd0q2"; - name = "kweather-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kweather-23.08.3.tar.xz"; + sha256 = "1zk4qf1r9c45zgqpnx5y2prm6d64vxhhycnbn07yk46zqnk6gifj"; + name = "kweather-23.08.3.tar.xz"; }; }; kwordquiz = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/kwordquiz-23.08.2.tar.xz"; - sha256 = "0h4pqlyll4qm6rg2h66gcw5ky7m4v93z526ncadd8s3f2hv1crkq"; - name = "kwordquiz-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/kwordquiz-23.08.3.tar.xz"; + sha256 = "0nqdax13syqwi5i3q4gf3cjnywricvdd2798v31naza39m06m6z1"; + name = "kwordquiz-23.08.3.tar.xz"; }; }; libgravatar = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libgravatar-23.08.2.tar.xz"; - sha256 = "04sn28m1cb37jh49yvsngncjlvcn36jyrjm5vvfnzcdcknbsc1s8"; - name = "libgravatar-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libgravatar-23.08.3.tar.xz"; + sha256 = "12k2fb6wnnba81d8amizf2npa5ydpj6s95sbn0s4qy329lgxmfp3"; + name = "libgravatar-23.08.3.tar.xz"; }; }; libkcddb = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkcddb-23.08.2.tar.xz"; - sha256 = "0i938vwi6l77115p19jqsck3baa3c3xmidz52pi3n0m7h2ddl9zs"; - name = "libkcddb-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkcddb-23.08.3.tar.xz"; + sha256 = "0b68vypfvkq5c7s5zqdwdr9r84x2gsvqavjz1dk6ybq4j5lm3ldz"; + name = "libkcddb-23.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkcompactdisc-23.08.2.tar.xz"; - sha256 = "1wb4andi9yrsngrrcj6ddzrjp9jlk4pv63qlm4h098v76chspyw7"; - name = "libkcompactdisc-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkcompactdisc-23.08.3.tar.xz"; + sha256 = "0a46yy0jzsddqgklvi8hgjg4h4f7six2d3higzrh7v2ychlqxqkp"; + name = "libkcompactdisc-23.08.3.tar.xz"; }; }; libkdcraw = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkdcraw-23.08.2.tar.xz"; - sha256 = "08j99rgdihrkhn8z6qsgaz6iidp5rsi7as5lka7m7qmvxdhal8lw"; - name = "libkdcraw-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkdcraw-23.08.3.tar.xz"; + sha256 = "0bzkdlhfkql38qm22qpiinl8p7pxhl5xpnw12l0ghjpdmnxzn1jl"; + name = "libkdcraw-23.08.3.tar.xz"; }; }; libkdegames = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkdegames-23.08.2.tar.xz"; - sha256 = "1rhwlyj0m7rd55q7n7v2f7qmspashfg7pn300wz7mi9g556qdvch"; - name = "libkdegames-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkdegames-23.08.3.tar.xz"; + sha256 = "14zavbir7rf5lgxyppngpbbxmpq9kyx45c170jpilma6a3dqm787"; + name = "libkdegames-23.08.3.tar.xz"; }; }; libkdepim = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkdepim-23.08.2.tar.xz"; - sha256 = "0h11hmcwvd8xggb4vk0ppp6yij7zcs3sgk3dgvyz3v9qi1x2db08"; - name = "libkdepim-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkdepim-23.08.3.tar.xz"; + sha256 = "043ddlssg3a0q48y3mvn9smmarmswmff0gz3gpw1m6waagymqrff"; + name = "libkdepim-23.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkeduvocdocument-23.08.2.tar.xz"; - sha256 = "1b5ka7jps9i29pd77pcr6spmw949p948iwbhf4afnzbpfbm41zi4"; - name = "libkeduvocdocument-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkeduvocdocument-23.08.3.tar.xz"; + sha256 = "19m1dzvgf34awbyabbwn03jyznv430jd4qxwj2lgp1684p2dqyab"; + name = "libkeduvocdocument-23.08.3.tar.xz"; }; }; libkexiv2 = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkexiv2-23.08.2.tar.xz"; - sha256 = "0cyh351n0djiq7vq3szwl6i1z60xwqaiysh531m88bmz12j3cvnh"; - name = "libkexiv2-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkexiv2-23.08.3.tar.xz"; + sha256 = "1p9qyqyl7348yfbnpw01s81agknllx77i07cvv9bmdcwm103vw07"; + name = "libkexiv2-23.08.3.tar.xz"; }; }; libkgapi = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkgapi-23.08.2.tar.xz"; - sha256 = "061sq28qs123xbxp4kivif6las1armvd3w1zc842lg1d94rq0jv7"; - name = "libkgapi-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkgapi-23.08.3.tar.xz"; + sha256 = "01c7933w8qspasd4l51mj21dnm9amdppwzn81naqhzj2ggh3f1ks"; + name = "libkgapi-23.08.3.tar.xz"; }; }; libkipi = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkipi-23.08.2.tar.xz"; - sha256 = "05xdswf4xfy8r01fmifzg913f4pijkaka5d2qw155xdv5rlqkmwn"; - name = "libkipi-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkipi-23.08.3.tar.xz"; + sha256 = "1jwhs7clznh4izbdxyhni7ks8hqb1m425kw847jjmhrzf7gj5bzv"; + name = "libkipi-23.08.3.tar.xz"; }; }; libkleo = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkleo-23.08.2.tar.xz"; - sha256 = "1b9snvnl5kfcf7kwn8i4p9kz58pr2k2vy8aa87iim9r3xmrazpw9"; - name = "libkleo-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkleo-23.08.3.tar.xz"; + sha256 = "1s0k7vc1iasahqy2sk98j1lybvv1ppwhrl1jpzlk6pca28pg6dqc"; + name = "libkleo-23.08.3.tar.xz"; }; }; libkmahjongg = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkmahjongg-23.08.2.tar.xz"; - sha256 = "0xq5kff90x6b5d4fcmmlk3g4b31nsih4ik0ymjnlvpyn10rb6j3n"; - name = "libkmahjongg-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkmahjongg-23.08.3.tar.xz"; + sha256 = "0x8nym9hfjg9823gxl00jhn182d6p9jjff8h8fvblh88h267rxr4"; + name = "libkmahjongg-23.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libkomparediff2-23.08.2.tar.xz"; - sha256 = "0sk4hydsrrrmx9sr609my1m8pj5cf5x686d6gp2mn52dr6lnsycb"; - name = "libkomparediff2-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libkomparediff2-23.08.3.tar.xz"; + sha256 = "1cbhd214shiphha8pmqrlxliq0szmr6qqksrjl70pq9k58myfq76"; + name = "libkomparediff2-23.08.3.tar.xz"; }; }; libksane = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libksane-23.08.2.tar.xz"; - sha256 = "0ccwzyfl4pm6g0q3ypbr53qda1jxbkr7xikxin0xym5m60xp5y24"; - name = "libksane-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libksane-23.08.3.tar.xz"; + sha256 = "0dynrv65q78r7zyl1is6jpi7ln6s7jciil27sjjlz1cwlhalq16f"; + name = "libksane-23.08.3.tar.xz"; }; }; libksieve = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libksieve-23.08.2.tar.xz"; - sha256 = "1kyins4l98pm9blk3q8qgcjg1jlbxrwl3ksp87qp2bvd883yd6rr"; - name = "libksieve-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libksieve-23.08.3.tar.xz"; + sha256 = "09iw7jv93pwfj0i6y4iyhi7f1z3sw2lx8y608bcpbsw6ki2hwiky"; + name = "libksieve-23.08.3.tar.xz"; }; }; libktorrent = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/libktorrent-23.08.2.tar.xz"; - sha256 = "08rpv8j855zcxhjvj422wvx5spaqbpincbcz81c6scjasfvipb1z"; - name = "libktorrent-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/libktorrent-23.08.3.tar.xz"; + sha256 = "1jl27xmk82yjfpwc7cj4hxllzksvc1mn0qlcc92r637zyw9haxfa"; + name = "libktorrent-23.08.3.tar.xz"; }; }; lokalize = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/lokalize-23.08.2.tar.xz"; - sha256 = "1n2h99ymifks3xfslaljkw5039r3w3gqk7fkyi7pyl620ydxxvl0"; - name = "lokalize-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/lokalize-23.08.3.tar.xz"; + sha256 = "1hbqwld7fiwjbzz0nas1wks0j7ganqb61nr78g4qrygyfz0fkk22"; + name = "lokalize-23.08.3.tar.xz"; }; }; lskat = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/lskat-23.08.2.tar.xz"; - sha256 = "0s4nz3mprd064ij487nrha9qg1zsyz1c4gcmxqib2y2ydjkf5k2r"; - name = "lskat-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/lskat-23.08.3.tar.xz"; + sha256 = "0j8qy8aih5jflndfw53fbfmg2v2dpah99pk0g7qisr21d0xdsnq4"; + name = "lskat-23.08.3.tar.xz"; }; }; mailcommon = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/mailcommon-23.08.2.tar.xz"; - sha256 = "0p14m70nm3mlv59ri2rlxk43b4xaw3jgzzdxlgn5z2jyaldxcqka"; - name = "mailcommon-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/mailcommon-23.08.3.tar.xz"; + sha256 = "0jami0ml0q414nz3lcwk5pvl21zfmfkpz751j8kqc3rvv7579y5r"; + name = "mailcommon-23.08.3.tar.xz"; }; }; mailimporter = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/mailimporter-23.08.2.tar.xz"; - sha256 = "0448jcqsgxrjzfazzd8qwm6k2y7rav504g700j7lpklsfnb8n10y"; - name = "mailimporter-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/mailimporter-23.08.3.tar.xz"; + sha256 = "02ii6vqpxwm4cvkkh7nfq3q9sdb9wlx09k3d1yzampv36rh015xm"; + name = "mailimporter-23.08.3.tar.xz"; }; }; marble = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/marble-23.08.2.tar.xz"; - sha256 = "0zymgm9wm87xpca0hr9yz95cwdg0m92hssqw1zkw2qag303rz8xb"; - name = "marble-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/marble-23.08.3.tar.xz"; + sha256 = "166264afbxjimgvz062918fgqc7ck8sz5qiz63m1w858irgifpl0"; + name = "marble-23.08.3.tar.xz"; }; }; markdownpart = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/markdownpart-23.08.2.tar.xz"; - sha256 = "1d2sv8gxl4px3pms3dfpcggr926h05f5bbjijacll2qjsi95hr0q"; - name = "markdownpart-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/markdownpart-23.08.3.tar.xz"; + sha256 = "1nw8r7m3h2j3aylmq5lg0c2rz9cmpsdlixh0ba3cpxcy1ddk4xmp"; + name = "markdownpart-23.08.3.tar.xz"; }; }; mbox-importer = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/mbox-importer-23.08.2.tar.xz"; - sha256 = "0d2m10zw4xy2m05d15nl3xsi5pc33w24ba2nfn3kr7z9chw45s0f"; - name = "mbox-importer-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/mbox-importer-23.08.3.tar.xz"; + sha256 = "0306gpa7ybcyx4p1fc1pgr8yh5q7rq7v025494ylwj3va9c6j5h5"; + name = "mbox-importer-23.08.3.tar.xz"; }; }; merkuro = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/merkuro-23.08.2.tar.xz"; - sha256 = "07ag6hs7idy2r1pkyyqgs96hy72hfch25va1ash2idfsh4k4fkpb"; - name = "merkuro-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/merkuro-23.08.3.tar.xz"; + sha256 = "1vqg3bl6qmnb0vk0l408i4liwq8ydnmr69a3ch8z54l1p2za3xlx"; + name = "merkuro-23.08.3.tar.xz"; }; }; messagelib = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/messagelib-23.08.2.tar.xz"; - sha256 = "1jg3a33277kb6clpn7icjcfh8i92nkp3z7i253navg92pa56q3nh"; - name = "messagelib-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/messagelib-23.08.3.tar.xz"; + sha256 = "1ss69pffs81aa6zi6hnnhxzmjfyigyahq6ranvc4q90gb49l95jv"; + name = "messagelib-23.08.3.tar.xz"; }; }; minuet = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/minuet-23.08.2.tar.xz"; - sha256 = "0sdzq35b7z0i8yc802famjxhic524izw89w6hi83kv4hfijqz958"; - name = "minuet-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/minuet-23.08.3.tar.xz"; + sha256 = "0j0p8kcd4m4fzc9cffhp70s6nl7xcd0wq6smzjq2v83x4fwpnqfl"; + name = "minuet-23.08.3.tar.xz"; }; }; neochat = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/neochat-23.08.2.tar.xz"; - sha256 = "128pdpym577mmpf1m7f3ykim2ll61js81yh2n1nd3wkvkhf2saax"; - name = "neochat-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/neochat-23.08.3.tar.xz"; + sha256 = "1gzkwwhrgrap100a1191r66g2kqclnq6jp73k5zgsacxcvf5bwcy"; + name = "neochat-23.08.3.tar.xz"; }; }; okular = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/okular-23.08.2.tar.xz"; - sha256 = "1p9f1xs6lgww6m1g1ni82fk62fmdfbmrpc6iawnfa9b9cqg9x9i5"; - name = "okular-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/okular-23.08.3.tar.xz"; + sha256 = "16qippfwkbxgznlg6f3csmhlk6rbpjqf0nmw11bmrsfng1smam22"; + name = "okular-23.08.3.tar.xz"; }; }; palapeli = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/palapeli-23.08.2.tar.xz"; - sha256 = "1xdghkyb81hz8rly54wwc2jk3qj5b3dp8br2hgb1ga7g95r5m1fr"; - name = "palapeli-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/palapeli-23.08.3.tar.xz"; + sha256 = "0jvb72ndq7c9q21x6gis8i9a8xxb61rjl62xs1adavy9x5za4j4q"; + name = "palapeli-23.08.3.tar.xz"; }; }; parley = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/parley-23.08.2.tar.xz"; - sha256 = "029m2p3f961ncx7f5girpxflcf6qw7x12p4cgdg89k4asyfpw5fg"; - name = "parley-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/parley-23.08.3.tar.xz"; + sha256 = "00dx3455b0wfpx1y1svgdvmfd1wcv2cyk61867nk34wn91mkk2jl"; + name = "parley-23.08.3.tar.xz"; }; }; partitionmanager = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/partitionmanager-23.08.2.tar.xz"; - sha256 = "17xm8mbq18l2kdp2b50v2ngnbfhc07h6gnzydihmyp3ql6amd0qj"; - name = "partitionmanager-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/partitionmanager-23.08.3.tar.xz"; + sha256 = "0b4klirhyqp4vgpy1gp1prdyknrdmsfbl2nz3kmkm47q97b3jsc3"; + name = "partitionmanager-23.08.3.tar.xz"; }; }; picmi = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/picmi-23.08.2.tar.xz"; - sha256 = "1hrc8vw34qwwdvalfyavdihc69bhmprdk0l4sizbyqx7vg60rvgb"; - name = "picmi-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/picmi-23.08.3.tar.xz"; + sha256 = "1nfwzv0lngxv6s57v4j8acq4kp94iq8swpiah4gf57ikwvfmwcbv"; + name = "picmi-23.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/pim-data-exporter-23.08.2.tar.xz"; - sha256 = "1gn83n2sx1rvc9rj1mk1dh1r56mhls10jdm4fqmasp20aacyjj3d"; - name = "pim-data-exporter-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/pim-data-exporter-23.08.3.tar.xz"; + sha256 = "0b2vcv7mkbwf2jvrwahnmh28h4gx6ng6hpxin4mr9ams2iv55s4i"; + name = "pim-data-exporter-23.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/pim-sieve-editor-23.08.2.tar.xz"; - sha256 = "1s9v9jxafx02hh5sqjb5ggmcvbsa8cl5q3gnhq7npjw34lv13sra"; - name = "pim-sieve-editor-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/pim-sieve-editor-23.08.3.tar.xz"; + sha256 = "03h40pdknqdclw312n4293h2hg30wvhkbwwim411w1nlryi028vz"; + name = "pim-sieve-editor-23.08.3.tar.xz"; }; }; pimcommon = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/pimcommon-23.08.2.tar.xz"; - sha256 = "1ismgb63f30kyrcy50y3prq092a3wzwirgqr1aqkfg0if8hf012f"; - name = "pimcommon-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/pimcommon-23.08.3.tar.xz"; + sha256 = "1j75s4b10kvy1mp9dli2z09jh57kwd018dd1br2yirqgrj3q2mk4"; + name = "pimcommon-23.08.3.tar.xz"; }; }; plasmatube = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/plasmatube-23.08.2.tar.xz"; - sha256 = "1ccwhhxm6a3afxmx2xckc8csinaa2sih3p6dsink3yqxsdb88w8f"; - name = "plasmatube-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/plasmatube-23.08.3.tar.xz"; + sha256 = "13szmsk7x1bril3hp7dzw844pfzk9w9is4l8h4a4y1xzm80y3y95"; + name = "plasmatube-23.08.3.tar.xz"; }; }; poxml = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/poxml-23.08.2.tar.xz"; - sha256 = "0dn0hn3gbzxdxi7kif9rq5cdvknm1i37ydfa3q2pr1kgds3xg58c"; - name = "poxml-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/poxml-23.08.3.tar.xz"; + sha256 = "135klpiigvibfk3vcjmkcl203zrmqbjrhj6wydnl0x8xa2sskv2j"; + name = "poxml-23.08.3.tar.xz"; }; }; print-manager = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/print-manager-23.08.2.tar.xz"; - sha256 = "0pdhlzvjz0mqjg8wa392j90qwwnphd6dgw4smnjvy2kbxhjq6mg2"; - name = "print-manager-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/print-manager-23.08.3.tar.xz"; + sha256 = "0h6w04w08pia84lxjmincxf5l88w2p6bqsz60caa6w743k6qcanv"; + name = "print-manager-23.08.3.tar.xz"; }; }; qmlkonsole = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/qmlkonsole-23.08.2.tar.xz"; - sha256 = "1avlrshm92xr9s1is0z60x792wa5jdbnvspf7d6w63i1qkyg2641"; - name = "qmlkonsole-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/qmlkonsole-23.08.3.tar.xz"; + sha256 = "0shjzdn6drjq0ngvvh4mzzl4csqlj3bc3j25wr459srxv7m8f40h"; + name = "qmlkonsole-23.08.3.tar.xz"; }; }; rocs = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/rocs-23.08.2.tar.xz"; - sha256 = "18d7lfzvl10sg7qz3q635q304al2jigpnf7qvn50698ydzp9v4wm"; - name = "rocs-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/rocs-23.08.3.tar.xz"; + sha256 = "03dksz8s47hgmwqqgn6n216nn3fs2iahw6nf90nnk57gkgl0f80i"; + name = "rocs-23.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/signon-kwallet-extension-23.08.2.tar.xz"; - sha256 = "1xiy1y9r1i994zbnqyqny947svdj5kg6n67zikjzvp5claimj4n7"; - name = "signon-kwallet-extension-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/signon-kwallet-extension-23.08.3.tar.xz"; + sha256 = "1lkh40nqz26f8v8gfgs3f74jvwylvpmix6pgklpnjz5q724630zw"; + name = "signon-kwallet-extension-23.08.3.tar.xz"; }; }; skanlite = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/skanlite-23.08.2.tar.xz"; - sha256 = "0wjxj4czpxpb9hhvccg3gymafr2g4myxi3piix4p2j5gxlamp82g"; - name = "skanlite-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/skanlite-23.08.3.tar.xz"; + sha256 = "0y877svxcnijbyj3g95m5w65fncl9pbkl4y6slvci8mysmx4cxpj"; + name = "skanlite-23.08.3.tar.xz"; }; }; skanpage = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/skanpage-23.08.2.tar.xz"; - sha256 = "1m0qyn3vsmymn0l14wldsa0vjf7mxgy6ybq4v6y9k1ck7h1jlb2n"; - name = "skanpage-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/skanpage-23.08.3.tar.xz"; + sha256 = "03lir17v5fmcvkgrwxlpd2cghnha275f3b2ks4dgdcqhpxfyx1zg"; + name = "skanpage-23.08.3.tar.xz"; }; }; spectacle = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/spectacle-23.08.2.tar.xz"; - sha256 = "11r3gpg58vdhmf95hm3z3rgz9zrvv7bmjkkssgkaw9pf7i0a4kls"; - name = "spectacle-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/spectacle-23.08.3.tar.xz"; + sha256 = "1nr4vawvr3n0mrvbasrbjppdri177fsxnyljihxkcldlbqdx8idx"; + name = "spectacle-23.08.3.tar.xz"; }; }; step = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/step-23.08.2.tar.xz"; - sha256 = "1ajsbv163nf4ys9b7kwir4g3r214nh0q94y07x24avqd17z41nm8"; - name = "step-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/step-23.08.3.tar.xz"; + sha256 = "19ipq26hbr38p9zbgn45ykhib7lm4cm880r1s8a6grdx8ziw6jx9"; + name = "step-23.08.3.tar.xz"; }; }; svgpart = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/svgpart-23.08.2.tar.xz"; - sha256 = "1bz0c49wag6l6k8217nzrf4vc2rxr425h5xbkky6c5mimvh1p1d4"; - name = "svgpart-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/svgpart-23.08.3.tar.xz"; + sha256 = "1lybl6pybawybds0w8l0fcx37i7axjkw9b0rhk5vn3sw397yvkra"; + name = "svgpart-23.08.3.tar.xz"; }; }; sweeper = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/sweeper-23.08.2.tar.xz"; - sha256 = "1jl3mhwmahlsx3dq0x9k8kwq4ya2949wzr3qlnaqmfz25xpj9h42"; - name = "sweeper-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/sweeper-23.08.3.tar.xz"; + sha256 = "1a7qh1rvzs5xk5aw19x29091psp0khjqmgs06avilfsfbpschkn0"; + name = "sweeper-23.08.3.tar.xz"; }; }; telly-skout = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/telly-skout-23.08.2.tar.xz"; - sha256 = "1r3pjlps24r0j2cdcpykd9jgqrw8czxwc7ahif3k82qg7n17varn"; - name = "telly-skout-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/telly-skout-23.08.3.tar.xz"; + sha256 = "1cxkzxq1nx62100a42m534wvgmv3m00im16j7lnjqknr4nidxzrb"; + name = "telly-skout-23.08.3.tar.xz"; }; }; tokodon = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/tokodon-23.08.2.tar.xz"; - sha256 = "09hf7rdrvpv96i1i819iwy82k466c9rprrwpn5nqpx8xlldncd7s"; - name = "tokodon-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/tokodon-23.08.3.tar.xz"; + sha256 = "0nc56jgl114zd95szq7jcjw6vqpklm0jk17l2s8nikwra06y2smx"; + name = "tokodon-23.08.3.tar.xz"; }; }; umbrello = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/umbrello-23.08.2.tar.xz"; - sha256 = "1ld51szc6fl56k6ndlhyrwml44y8c1v25hyqrizxw16fr01l7znr"; - name = "umbrello-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/umbrello-23.08.3.tar.xz"; + sha256 = "0l3mxnyhyhm5h7gyhw5q28yzcsxkgsjqpcbnyhy74pdjw1xs969v"; + name = "umbrello-23.08.3.tar.xz"; }; }; yakuake = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/yakuake-23.08.2.tar.xz"; - sha256 = "19mz19bg7gjvaym8zz3jk108mn07759yldpdw2y02zaljlyahz0i"; - name = "yakuake-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/yakuake-23.08.3.tar.xz"; + sha256 = "16h3zanzxjqdl9rvyxplvr35bjkzz2qfxqmm1fkjsq1vbb9lxf6r"; + name = "yakuake-23.08.3.tar.xz"; }; }; zanshin = { - version = "23.08.2"; + version = "23.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.2/src/zanshin-23.08.2.tar.xz"; - sha256 = "1a0fnz9b5mp0yq3jz6h465pjf45vaqdqd9ldcdlqjvyj3wjp6nhh"; - name = "zanshin-23.08.2.tar.xz"; + url = "${mirror}/stable/release-service/23.08.3/src/zanshin-23.08.3.tar.xz"; + sha256 = "0dcakpv36zmiad2686bcw7ll9mpw3dj4sxd7dqlhvl0n7hhm2gxf"; + name = "zanshin-23.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index b8f8d09bdfd7c..f17a939b53cfc 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -34,7 +34,7 @@ appimageTools.wrapType2 { description = "P2P note-taking tool"; homepage = "https://anytype.io/"; license = licenses.unfree; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix deleted file mode 100644 index 4d7789f033b56..0000000000000 --- a/pkgs/applications/misc/binance/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: - -stdenv.mkDerivation rec { - pname = "binance"; - version = "1.39.0"; - - src = fetchurl { - url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6VQerIzX2u8QGUsa8kvu6Qud3OEn9lrZkQddfkZ1X0g="; - }; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - makeWrapper - ]; - - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss popt ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - runHook postInstall - ''; - - postFixup = '' - substituteInPlace $out/share/applications/binance.desktop --replace '/opt/Binance' $out/bin - - makeWrapper ${electron}/bin/electron \ - $out/bin/binance \ - --add-flags $out/opt/Binance/resources/app.asar \ - --prefix LD_LIBRARY_PATH : ${libPath} - ''; - - meta = with lib; { - description = "Binance Cryptoexchange Official Desktop Client"; - homepage = "https://www.binance.com/en/desktop-download"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7bc7b4dc5cc51..b8b7eb435acd9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \ + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index 4898c8cb9f5f5..c9caa508f171f 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.16.0"; + version = "5.17.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-Y+v/r5bhtgXBjRQic0s5FA+KMWx5R7DOK+qZ9Izdnb0="; + hash = "sha256-yxph3Aor5nZOhu2PY4MGcfScaz9w24JXqXbhT+QKlNI="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index fe33a7df75690..240370297d10b 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.33"; + version = "3.34"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - hash = "sha256-cX+ydMvpQNFfQICRVKyhnB5gZkVnOMLPbGgdFymzmeA="; + hash = "sha256-KuDNngHOoeEHJExEHoLdNO95ZUvLx8TWiAOTmRKHtmQ="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; @@ -33,10 +33,9 @@ perlPackages.buildPerlPackage rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/man/man1 - cp get_iplayer $out/bin + install -D get_iplayer -t $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB - cp get_iplayer.1 $out/share/man/man1 + install -D get_iplayer.1 -t $out/share/man/man1 runHook postInstall ''; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index ccb597db62d0c..25e541cf3d483 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -9,6 +9,7 @@ , svg-path , pygments , watchdog +, fetchpatch }: buildPythonApplication rec { @@ -25,6 +26,13 @@ buildPythonApplication rec { nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + patches = [ + (fetchpatch { + name = "fix tests with pygments 2.14"; + url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch"; + sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; + }) + ]; meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index 569492d296e86..b3800d6c7e112 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.5.17700"; + version = "2.1.0.18144"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-BO9W9miQUltsg1tCyTl9j5xRCJUCsO02hUKDCYt7hd8="; + sha256 = "sha256-K65naW+RWAy4uxQq2GQmL0kwCH+G73ez1kgTtnTwjEw="; stripRoot = false; }; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 8dacbf8145139..43d320a4c0435 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,18 +1,20 @@ { lib , fetchFromGitHub , python3 +, testers +, jrnl }: python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "4.0.1"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI="; + hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o="; }; nativeBuildInputs = with python3.pkgs; [ @@ -20,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - ansiwrap asteval colorama cryptography @@ -51,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { "jrnl" ]; + passthru.tests.version = testers.testVersion { + package = jrnl; + version = "v${version}"; + }; + meta = with lib; { changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; description = "Simple command line journal application that stores your journal in a plain text file"; diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 7e28366b94cc6..0876bf6c15efb 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "1.2.3"; + version = "2.0.6"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-AhMl8UuSVKLiIj+EnnmJX8iURjytLByDRLqDkgHGBr0="; + hash = "sha256-G5/Sb/suTUkpR6OGlOawLVGLTthcrp78Y+5mxlndfA4="; }; - cargoHash = "sha256-pgdI+BoYrdSdQpVN0pH4QMcNAKbjbnrUbAmMpmtfd2s="; + cargoHash = "sha256-7P93mttZ9W76lpGPKN33cgr4nEaHRlDQWov+TUbDHkM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff b/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff deleted file mode 100644 index 3a438e2519a10..0000000000000 --- a/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce78a9d..3cd51e0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,18 +8,21 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) - # Common configuration - set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -- --# Setup Conan --if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") -- message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") -- file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" -- "${CMAKE_BINARY_DIR}/conan.cmake" -- TLS_VERIFY ON) --endif() --include(${CMAKE_BINARY_DIR}/conan.cmake) -- --conan_cmake_autodetect(settings) --conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) -+set(USE_CONAN ON CACHE BOOL "Use conan for dependency managment") -+ -+if(USE_CONAN) -+ # Setup Conan -+ if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") -+ message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") -+ file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" -+ "${CMAKE_BINARY_DIR}/conan.cmake" -+ TLS_VERIFY ON) -+ endif() -+ include(${CMAKE_BINARY_DIR}/conan.cmake) -+ -+ conan_cmake_autodetect(settings) -+ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) -+endif () - - # Setup Qt - set(CMAKE_AUTOMOC ON) diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index 1e358299f5fd7..70941045ce368 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -1,13 +1,16 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , magic-enum +, range-v3 , spdlog , qtbase , qtconnectivity , qttools , qtlanguageserver +, qtwayland , wrapQtAppsHook , libXScrnSaver , nix-update-script @@ -15,15 +18,24 @@ stdenv.mkDerivation rec { pname = "kemai"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; rev = version; - hash = "sha256-PDjNO2iMPK0J3TSHVZ/DW3W0GkdB8yNZYoTGEd2snac="; + hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM="; }; + patches = [ + # Backport the fix for an issue where LICENSE.txt ends up in /bin + # Remove in next release + (fetchpatch { + url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch"; + hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg="; + }) + ]; + buildInputs = [ qtbase qtconnectivity @@ -31,10 +43,14 @@ stdenv.mkDerivation rec { qtlanguageserver libXScrnSaver magic-enum + range-v3 spdlog + ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + cmakeFlags = [ + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DFETCHCONTENT_QUIET=OFF" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" ]; - cmakeFlags = [ "-DUSE_CONAN=OFF" ]; - patches = [ ./000-cmake-disable-conan.diff ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -48,5 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; + broken = stdenv.isDarwin; + mainProgram = "Kemai"; }; } diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 5f870d51a5baa..aad0de40bf0f2 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-/gRm3fViTpoTOkIEu6+mrGTVTAFTmwdWV0MKoFF5vkc="; + sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 34600bb351eca..d3e11493fad80 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nwg-piotr/nwg-launchers"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index c0fb436b7f8a7..63734811ff438 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, vcg, glew, qmake, libGLU, eigen, libGL }: mkDerivation { @@ -12,12 +12,23 @@ mkDerivation { sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j"; }; - buildInputs = [ qtbase vcg glew ]; + patches = [ + # https://github.com/cfcohen/openbrf/pull/7 + (fetchpatch { + name = "fix-build-against-newer-vcglib.patch"; + url = "https://github.com/cfcohen/openbrf/commit/6d82a25314a393e72bfbe2ffc3965bcac407df4c.patch"; + hash = "sha256-rNxAw6Le6QXMSirIAMhMmqVgNJLq6osnEOhWrY3mTpM="; + }) + ]; + + buildInputs = [ qtbase vcg glew eigen ]; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; + env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3"; + postPatch = '' sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro ''; diff --git a/pkgs/applications/misc/owmods-cli/Cargo.lock b/pkgs/applications/misc/owmods-cli/Cargo.lock index 128ab926d1590..cc776f8b27be7 100644 --- a/pkgs/applications/misc/owmods-cli/Cargo.lock +++ b/pkgs/applications/misc/owmods-cli/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -129,7 +129,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -185,9 +185,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -248,12 +248,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "serde", ] @@ -265,9 +265,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -277,9 +277,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -315,7 +315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -372,9 +372,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", @@ -382,25 +382,24 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] name = "clap" -version = "4.4.0" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", @@ -410,23 +409,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -437,9 +436,9 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clap_mangen" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9" +checksum = "b44f35c514163027542f7147797ff930523eea288e03642727348ef1a9666f6b" dependencies = [ "clap", "roff", @@ -639,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -673,7 +672,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -684,7 +683,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -799,15 +798,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "embed-resource" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", - "toml 0.7.6", + "toml 0.7.8", "vswhom", - "winreg 0.11.0", + "winreg 0.51.0", ] [[package]] @@ -839,9 +838,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1001,7 +1000,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1606,9 +1605,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -1761,9 +1760,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "4f7765dccf8c39c3a470fc694efe322969d791e713ca46bc7b5c506886157572" dependencies = [ "serde", "serde_json", @@ -1811,9 +1810,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "line-wrap" @@ -1826,9 +1825,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1910,9 +1909,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[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" @@ -2190,9 +2189,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -2247,7 +2246,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2258,9 +2257,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -2293,7 +2292,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owmods_cli" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "clap", @@ -2308,7 +2307,7 @@ dependencies = [ [[package]] name = "owmods_core" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "directories", @@ -2334,7 +2333,7 @@ dependencies = [ [[package]] name = "owmods_gui" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "log", @@ -2535,7 +2534,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "indexmap 1.9.3", "line-wrap", "quick-xml", @@ -2759,13 +2758,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "regex-syntax 0.7.5", ] @@ -2780,9 +2779,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -2807,7 +2806,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -2907,9 +2906,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", @@ -2920,9 +2919,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -2936,14 +2935,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", @@ -3076,14 +3075,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa 1.0.9", "ryu", @@ -3098,7 +3097,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3128,7 +3127,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", @@ -3148,7 +3147,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3251,9 +3250,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3353,9 +3352,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -3394,10 +3393,10 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.4", + "cfg-expr 0.15.5", "heck 0.4.1", "pkg-config", - "toml 0.7.6", + "toml 0.7.8", "version-compare 0.1.1", ] @@ -3483,7 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "bytes", "cocoa", "dirs-next", @@ -3555,7 +3554,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "brotli", "ico", "json-patch", @@ -3696,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -3731,22 +3730,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3761,9 +3760,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa 1.0.9", @@ -3776,15 +3775,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3823,7 +3822,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -3836,7 +3835,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3908,9 +3907,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -3929,9 +3928,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -3966,7 +3965,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -4059,9 +4058,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -4092,9 +4091,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4176,9 +4175,9 @@ dependencies = [ [[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", @@ -4226,7 +4225,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -4260,7 +4259,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4702,19 +4701,19 @@ dependencies = [ [[package]] name = "winreg" -version = "0.11.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -4722,9 +4721,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" dependencies = [ "base64 0.13.1", "block", diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix index f0e325677a912..1ff98c28a9852 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/applications/misc/owmods-cli/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, nix-update-script , fetchFromGitHub , rustPlatform , pkg-config @@ -11,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90="; + hash = "sha256-CobGF3ZQEdRRoMGL9l37alGQArIuRxiFbihQoRdnAsc="; }; cargoLock = { @@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec { dist/cli/completions/owmods.{bash,fish,zsh} ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "CLI version of the mod manager for Outer Wilds Mod Loader"; homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; diff --git a/pkgs/applications/misc/owmods-cli/update.sh b/pkgs/applications/misc/owmods-cli/update.sh deleted file mode 100755 index 4848dc3210b38..0000000000000 --- a/pkgs/applications/misc/owmods-cli/update.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget - -#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh -set -e - -dirname="$(dirname "$0")" - -updateHash() -{ - version=$1 - - url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version" - prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version) - sha256="$(echo $prefetchJson | jq -r ".sha256")" - echo "sha256=${sha256}" - - sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix" - - #downloads and replaces .lock file - wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock - -} - -updateVersion() -{ - sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" -} - -latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name") -latestVersion="$(expr $latestTag : 'gui_v\(.*\)')" -echo "latest version: ${latestVersion}" - -echo "updating..." -updateVersion $latestVersion - -updateHash $latestVersion -echo "updated cli" diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 7f09f3b616196..a7b9041a34e2f 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-WGavhxCGM10LXKvrXT3A2SOMSJRuoA/wAlEj7NFs8Ok="; + sha256 = "sha256-e/QXwRVtgl9+BaKbkeztCPfXORhef1HaKBPzKvVPVpM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 29f3c0c35b328..d9ae209dda21f 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.17.0"; # do NOT update to 3.x Windows releases + version = "1.18.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-C1mt9MklZoQNzs6zhk9CskeA4FfDsBVHNx/LRaqxWiI="; + hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8="; }; strictDeps = true; diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index 1d7ef32cd37ea..1466d3e23233e 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -26,6 +26,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { description = "Window switcher, run dialog and dmenu replacement for Wayland"; homepage = "https://github.com/lbonn/rofi"; license = licenses.mit; + mainProgram = "rofi"; maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index be0d29ee507d0..93a6c069f6693 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI="; + hash = "sha256-cs1kj/spZtMUL9aUtBHINAH7uyjMSn9jRDF/hRPzIbo="; }; outputs = [ "out" "udev" ]; @@ -38,13 +38,14 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ evdev + dbus-python gtk3 + hid-parser psutil pygobject3 pyudev pyyaml xlib - hid-parser ]; # the -cli symlink is just to maintain compabilility with older versions where diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 572e524aeeab4..9c6c8f93f3f72 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-3u55Pcd4VNgWGyu/IVsrMqm8E4H9y4Bvt3JMyIL/KXo="; + hash = "sha256-5WIITzm9yZWB847WHL+okwpULdwHegtZfvsVrAzwTO0="; }; vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc="; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 93d539b9f42d5..4f1a5fdef6b3e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -33,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.7"; + version = "1.4.8"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54="; + sha256 = "sha256-Fy3cy6c36Qsi8F7cC/MI8g6tdfkn8fDBncL+ZOoiGcs="; }; buildInputs = [ diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 829def809d0cf..f5ce961e401ac 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -42,6 +42,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { patches = [ # Allow setting MEDIA_ROOT through environment variable ./media-root.patch + # https://github.com/TandoorRecipes/recipes/pull/2706 + (fetchpatch { + url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch"; + hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs="; + }) ]; propagatedBuildInputs = with python.pkgs; [ @@ -113,8 +118,8 @@ python.pkgs.pythonPackages.buildPythonPackage rec { touch cookbook/static/themes/bootstrap.min.css.map touch cookbook/static/css/bootstrap-vue.min.css.map - ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse - ${python.pythonForBuild.interpreter} manage.py collectstatic + ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic_js_reverse + ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic runHook postBuild ''; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index ac188fcbc5f75..c8a2be9b3bc98 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,45 +1,38 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25, libsecret }: - -stdenv.mkDerivation rec { +{ lib, appimageTools, fetchurl, asar }: let pname = "todoist-electron"; - version = "8.6.0"; + version = "8.9.3"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage"; - hash = "sha256-LjztKgpPm4RN1Pn5gIiPg8UCO095kzTQ9BTEG5Rlv10="; - }; - - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + hash = "sha256-L1uH5bnJ66QxAXs7yywG4H/FaunwTX1l+tVtRe2nxdc="; }; - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512 - - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512 - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron_25}/bin/electron $out/bin/todoist-electron \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} + + # Get rid of the autoupdater + ${asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${asar}/bin/asar pack app $out/resources/app.asar + ''; + }); + +in appimageTools.wrapAppImage { + inherit pname version; + src = appimageContents; + + extraPkgs = { pkgs, ... }@args: [ + pkgs.hidapi + ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + + extraInstallCommands = '' + # Add desktop convencience stuff + mv $out/bin/{${pname}-*,${pname}} + install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/todoist.desktop \ + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" ''; meta = with lib; { @@ -47,6 +40,6 @@ stdenv.mkDerivation rec { description = "The official Todoist electron app"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; - maintainers = with maintainers; [ i077 kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza pokon548 ]; }; } diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 07857fbf5e9c6..76eb27a624cc6 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another telephony engine"; - homepage = "http://yate.ro/"; + homepage = "https://yate.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6282b812b2499..321ef367c5fea 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx + meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx gettext wrapGAppsHook libxml2 appstream-glib ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2a686f87d1640..ff0c83527aabf 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -62,7 +62,7 @@ buildFun: let - python3WithPackages = python3.pythonForBuild.withPackages(ps: with ps; [ + python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); clangFormatPython3 = fetchurl { @@ -437,7 +437,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python3.pythonForBuild}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3.pythonOnBuildForHost}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5a7bc3efa8d8d..4714704c0e79c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2023-09-12"; }; }; - hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA="; - hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs="; - version = "119.0.6045.105"; + hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; + hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; + version = "119.0.6045.123"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2023-09-12"; }; ungoogled-patches = { - hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc="; - rev = "119.0.6045.105-1"; + hash = "sha256-4EbfM62KuG8nHrYWwp183V5G9ac7FICjpyJahnKbQjE="; + rev = "119.0.6045.123-1"; }; }; - hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA="; - hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs="; - version = "119.0.6045.105"; + hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; + hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; + version = "119.0.6045.123"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5ac761db99db9..8408732d23d6c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "119.0"; + version = "119.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ach/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ach/firefox-119.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b39b5d57d6cffa2a70b5bc0b79437b0b0bae8c6e8c0cb59cad1a06949367b5cc"; + sha256 = "cf90a2af34183711ef83f591436a2428bb48bcd5a3d0d0cb4efb0d37434f3baf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/af/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/af/firefox-119.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "918c39a93f193d796763d366bda8ca821f048c696f25dd4d82ec3a66e630eff6"; + sha256 = "35b7475c9bb0cd12638851d73192c0381139b47bd65668c6451d228f767c5d81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/an/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/an/firefox-119.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "fc56648a834e860516c743138ae7dabd79271483150a28aa4af1d64cedb227b6"; + sha256 = "c6cf760fdacc1902efe5ca3c06c22da43436cc0371b4f699be1de354fb7ebeec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ar/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ar/firefox-119.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6a4ba37c37eac8807c64aab68a8904b533da34ebe12064a70595a798827dda86"; + sha256 = "0e0813d7d21455f62eef15130849e4fdaa52da9e1f487e3b200f3664f29e9076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ast/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ast/firefox-119.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bf9eec66de4b202200132c3f31a1532a81753f34ea827485ba6e96ca7ba36ead"; + sha256 = "edb9adab523ced71fe3b85d6d2527a2fb587682601a7aec1a1ca9ab712dd2a29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/az/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/az/firefox-119.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "13ea61d828ca7eecb8960f40d779454b612c711865a3caa47f0f9bcb0c7f70c8"; + sha256 = "af34649c9fcf0a397cc5715a4e7fa2cd21f165d8b7c1452542bb1e8ecbe7843b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/be/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/be/firefox-119.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1c6c629c02034cd562b440302ed148c4ec080e6c93ca74b7244b47baec96973f"; + sha256 = "8e88629368f81b58651ddd213048b25f62c8b4ddb4d5a9eb92ec5e2b7b4d83e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bg/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bg/firefox-119.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f382168dd2aad7c13ccdedbdc5f43167e6030d8aa8159eb8b5b01c0454c5d367"; + sha256 = "926605f038c8d4d44210007471a2d617c41da37585f71e4726b64305b90b77b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bn/firefox-119.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c149b1dfa5517489677e8a613e04a15f781866b01bdf3e711d9afa9f65c08499"; + sha256 = "50780e68b79f19e32a2b53b7d6d6c75948ffd2177e8abd7b97f14472dfed16f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/br/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/br/firefox-119.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "350540c67927823dbf0757dfc2561d9219ee71d576ca3ff2f86ce4e9c831118c"; + sha256 = "f39aa05fee3009f13af80a3c2cfbeaf3eceb3b02628cc6a312c23cb60baab689"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bs/firefox-119.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "59a9dbc269c2ee815b7698eb5a0eacd9b310e604ae0df766503e6914c0bf740e"; + sha256 = "bb58d680f4d6e63e2bb12f18da287f47a6ae5791b2bbbb924ab5bc8750ea382f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ca-valencia/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca-valencia/firefox-119.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8b5f0b091b5d8236c68e07ed1d0484994cb5d7082605f79c8ee01b96b1219b56"; + sha256 = "c677065bd25fd39047b9fe1f10b9f654e29e8af131e1420e04d063b2e7a236c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ca/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca/firefox-119.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7c8435210f1dcf5e577c85eb5607b231d36a42233d2a42bf3f58626e9fe313ce"; + sha256 = "5436dade80ee8d46ec5cb3ad32b156a0153ad01a08d4e7a71f21f685e9db7df5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cak/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cak/firefox-119.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1f88c845c86881eaed91552028206abd62b0d20c87e57c58ada6bd725c6efaee"; + sha256 = "b7fd3c229d0335ef2f5c5fa6f30847fea9596961863d3600fc5b333fecce2eb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cs/firefox-119.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0983f8406f4dd3c15bb9679cc4da17bf0d2e55fc1d2a2108d98c6b1f26823161"; + sha256 = "08e74645081c93cebc5ee40f6ddd074d1dd09e8ab822c2be496b20c1133db262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cy/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cy/firefox-119.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e223b1a0af9265d69fd7cc640959562db028f7be4e57a106a8a58b22198cb36b"; + sha256 = "28b6bd6f71805310b18cd8c4363da666051711433db849909787b4228ac09895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/da/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/da/firefox-119.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "af0c8bf6987638b39156c34359f79cd89371af513510de83068e427cfbd1f76b"; + sha256 = "252918ac59d208c2f457171085974d4a8525a2fbaea406af0079823a6bddf784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/de/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/de/firefox-119.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5b686480faa5e93b88f18148179f44a068e2152fdec20187fc9e5bf184adee6e"; + sha256 = "dc784325d72c64e1f7b9b6014538c0f6c728deb5398e5d43eae17dca5899c800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/dsb/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/dsb/firefox-119.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e4e69bf057f5de0086958f6023319b922fcb852ba9467dd40ec1c14d6f68efd7"; + sha256 = "64b769c4f0e1b5c77a57302b5502a65138ca5f24438c34913abb27f08d56e3bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/el/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/el/firefox-119.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "57307cc86a5aef496053f116854d46adf65bac39a01f6d56f84d572d1b539ed2"; + sha256 = "f0db76422f958cc3f7b4cf29165b41cb50a3aa04ca74265397f71cbee925cd9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-CA/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-CA/firefox-119.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5361c64b7b98c9a6df89d06364e18d8e0b5bf0ec6e20a1363ca841cb6a03df9"; + sha256 = "d9e86adbfe21f7f503f12a5e084a082e6d6b461cbefbe94881c4b752629992c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-GB/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-GB/firefox-119.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ac25fba40006fe6a92d7c08eff26a595e594728ed913799a31f4bb3ba183257e"; + sha256 = "ba27957e33e3f4a8a57735e058b84c004da9a6357731f58ef4daf2237f8d4268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-US/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-US/firefox-119.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3cba47e712cec5de5716666ef640f678d65ffb3c8ed5a67986296dcfa59fbc32"; + sha256 = "7d7e65a8e8f11a821545cdb9a3348c68d4fd60d2b6f5454fb17dc4d42fabde56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/eo/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eo/firefox-119.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "82013838fab41be6cc427e13ce05664d100cf4b36fba2bb1c7e6de4bb5e17427"; + sha256 = "892a91efe311e99286e44799b7f50445a27a29f0ea9040e556d29aed5a343421"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-AR/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-AR/firefox-119.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5d29218c1edb409e16229e5f579b9b212bd13547686f09597fc1721b50385490"; + sha256 = "65a1324bccfad9edc6adda59362753f5272fda40d8b909606bd120fbf36c1ca8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-CL/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-CL/firefox-119.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "200d3d3e5cca0a1e7be2c4dca8476b8c84500201769791f4de193a9c00dc069c"; + sha256 = "6571688a29d48d284309bf6c7f6648ad5bc973b6399a15d1f6f1d06304bf116f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-ES/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-ES/firefox-119.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e158a68eb5da1e503bdf05ee3bb687b0540fef16725293371ccfbdbd085c120a"; + sha256 = "2e2e09a0e93857a4405ea4f30db542f445f8f3faea324131d147a95ba1e8f58d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-MX/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-MX/firefox-119.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2b430ad86706fb2b602dcaceb2d71c8eadb28259e55a95cf6e75eda2cfbbfc76"; + sha256 = "eabebd5780be18881bfb054e6bb7f9c98a823a3de443e8fd044ee59c7e60d55f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/et/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/et/firefox-119.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c86da524f593aa1e78322a0f289dc293dfa6ea6cb770ec28eed4dec448476bad"; + sha256 = "7c5bfab9fd30c5b671a1901071f7de0d555c7637f87105b5af949fdcc4eae0c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/eu/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eu/firefox-119.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3046b38b745175f3a9ba8b5e093ae79c8c238a1df56fadef165e075ffd3b3320"; + sha256 = "617f6f49e8d8eee2549a33716e9911209a1cc049327cd4f6bf00825b15ef21c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fa/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fa/firefox-119.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "404503bd56a6bc2cba8e65cb20018f0e80c5cf290573e0ad3b14dd75bbf9bc39"; + sha256 = "17cea2b9830e500f9ed8503e153fe03c4f4ac924fa3e9f6e757c37ced72ee0db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ff/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ff/firefox-119.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "98c702ef329c24e3c6b7e7ccf7004894f39a646c18b58aafe23c9e90bf96be47"; + sha256 = "704e1b267c71f76c16ae62a39c52a8f3cabd51ab7ab9b5a5734afd3c978a59bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fi/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fi/firefox-119.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "562c31519ada2355e4b8739e03aed937356424fa35bf60cc1a55114d208a668a"; + sha256 = "ce61c29255cdfce6cd4da9c7ce7e3432629b7fb08f35314ff12282d0e4f8af45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fr/firefox-119.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d7a2df46a6e35c15ad84556e8b8042ca3915faa4875b5c6d2cd0a7edc835072c"; + sha256 = "0c5f6b764a9a6334d9759ff0a58a0129cd9d4054ccdafc829f2bc902a19d4630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fur/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fur/firefox-119.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "ef596a90fa2acecb0b6a11be98edf355ea929c20276f7b51ca179f8890e9e3dd"; + sha256 = "f9df9b54a4bb771ac4faae64de3ede13fda4026424ad0823db8f437f3520a966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fy-NL/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fy-NL/firefox-119.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "dacbf9e586c3bd3bf70d0cfbaea637dfb9e78bf58d44283778c875c2e47e558d"; + sha256 = "f71d895584edb495d80773e9f8687a1d56ff548cfb332ebd2e226bd500d62b7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ga-IE/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ga-IE/firefox-119.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "621d157491c09010f68baa54b893759b85cd350daadda4081574e58be50e946a"; + sha256 = "b7b6b99174277532bd2486dfd86ab94c036c5a1937336467376dfd7e885336a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gd/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gd/firefox-119.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d0433bd49687a042d0a7d3cf79f8f128a330fed546bc9ff78258d4797fc0fe42"; + sha256 = "43f6432c2b1e21b5178d83ab7cfb5381ead41029b24e3135ebe6daefab5aaf65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gl/firefox-119.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "193c4c8bde818a06b0284a836d6be803955727b12043a1ed79c748d79de31825"; + sha256 = "69bcee258ce0d6b39e7654484950b6e45f4306f2067d36fd5c67acf248468c1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gn/firefox-119.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "079dab78929dec897f912bd2cdde3b13a64e9ef5e21e98c5030cc0482d9574bd"; + sha256 = "24a154468da6beff23afe0496d5c0b7c526f849eda9a0ca30e535de459d4ee3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gu-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gu-IN/firefox-119.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ee9670c5e502e6c6bef1c1b118e16624cb6df5be68e136961083d3ca7d4e8400"; + sha256 = "442ba0d079f8076e5de265b91dd27cd747ec27f88aaaf68b5dc730b98b5a93b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/he/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/he/firefox-119.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "24ac7821df7d752ffa8f959dbf4cf85ee3c2189b415b15e6a3fcbdefb9953dd0"; + sha256 = "c9de9ba5a4570e3de878d88404ee821ddddfd817fa62522b16e3b501ee0221ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hi-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hi-IN/firefox-119.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "46fb02f9332139f1e2966df339c07ec0a91ba42744e4afb5e9a54ed3d7b98f59"; + sha256 = "b9a5a03540c19518629e180abc5680328e605e6c3c5c1128df12bdcba1a0567c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hr/firefox-119.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4faa0d060c9ff8754d3ae1dbddade68fc45ec0fa9c736643fdb2bd8b35974e04"; + sha256 = "20bd65fb8a50d007f5f8ea1ec1c90ee118d598b931c30078f89ddae86f4dbf83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hsb/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hsb/firefox-119.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cd64231d3afcdec60743153eeb4b1f0bbb56234f6ac77b8e1e694514656a4e02"; + sha256 = "11d2da7ef251c5c065e5410d912664e641c9ce9b99f140dfa33ab549e52590b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hu/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hu/firefox-119.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "94264673a553ad4def9ea264ca3d97f1208a780ea367e26857dc8d1d8622744a"; + sha256 = "5afb7d769b1377884f155d952243dde4bfda4231e21e37c21c6fed9aada72f82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hy-AM/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hy-AM/firefox-119.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "dfb11193bc4d8ef993bbeab5c66c9b365d860fff3426a6473cc85fe168c17264"; + sha256 = "446e429b5f51ef686b8437583cebbe05bea9899bcf15b18bf2a409a5488fd2cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ia/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ia/firefox-119.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "73506b0eb9e2b8d7b233b66cac2e71bf570a9ca4bdeaade7e3ac6fdb7326a7d5"; + sha256 = "dc24337bb7919c9d1e6943688a6c23fd35cfdd259ce3380a11865e42f80d9c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/id/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/id/firefox-119.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b819e003fa942117ad01ca57082eedab1150f8bcdc11bb5345083fc170d36928"; + sha256 = "1055e7944bf3718cb39a9bb974492348f5d4133fbb36caa25dc70a422a1ae65e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/is/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/is/firefox-119.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "81c44e530d1d7781b3df276a9f384e703c7faa95e119969c28095d42c177b161"; + sha256 = "92d02b4eba5ba6932157a89cc54345842db05ded27303d1a6a3f41fecbdc3d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/it/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/it/firefox-119.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ad8b2f146772487809fba1e81d01d66ceadf29d4c41c05c4dac4bd62ee7e674b"; + sha256 = "42e8fd5a2b9ebd70a7a4c06e540235705e83f0ddb04ad6e4a896bea3cba28e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ja/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ja/firefox-119.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a66a5eea3b15d0fe5bcf9276e152f214d5156692d6ce062ce94d90849d209b26"; + sha256 = "d3428500cc6c12ed769f4dbe8b0ef3a3f8dbded9c03e7a0ba602b4694a4a1ac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ka/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ka/firefox-119.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "dd1817b054d70c64f529c0549a6424567a58200a23716488655152ee2d38e2cc"; + sha256 = "e233bce15359f237b59ef3a86df23800cf6ef0566a1503c343b4d392b4100adb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kab/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kab/firefox-119.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a6c1eda609f94651bd97cac31c830c8c19b6e3c085b233caa569eedd99999997"; + sha256 = "18bdd5a8c63b5670545076848d25be9002742eaa18139f35df35b5d802065e33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kk/firefox-119.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "35afce4fba1c41ac276a03cdf688232df8f3b3177b6797bfe83407111d9c596f"; + sha256 = "852365e6037bda685eaceebd965d90eb76f6b8519a06ca9a6fdbae9a945b5f70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/km/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/km/firefox-119.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7b40552893a20c3463cdd6ac1f378d44c3c2199141e980261f2fe899d8e9ce92"; + sha256 = "31e9a5977bd9280d8ebc392f1133a2cfb0837a4ab18df8188bc4c1202de3af58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kn/firefox-119.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2d7c2003218f0404f2f20896d924cf5df179c6ff2fd61616876e485b4ad9d084"; + sha256 = "25fed3cac9a152d696b7016f1ab1b954a763e6476797bb7e8e1c69683e5683d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ko/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ko/firefox-119.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "46ec2ab8e5898f3c063bfcecbdb16a21e14b150718259c9d6f82e8f0a5147d8f"; + sha256 = "3e26b5dfb9625b5a422caf9da7f4bad28ada9853b169ba2505c7111a55d20c30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lij/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lij/firefox-119.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fe103d6b1377898242421518b691916df27ab414ae3b47fa71694e2a673a552a"; + sha256 = "669b90a4d97e6baa310c096c82a14536ebc95287c3df21de97ae67c7808c270b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lt/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lt/firefox-119.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a174153a909957ff3a41ee263ba95f6e30786007c2e74be0ff1c68d1dbc55c7e"; + sha256 = "20aef23a5e3e8573c22c600eb63f920908737dcff33a049a67790832eb8f02af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lv/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lv/firefox-119.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3ba44426c9654bc44f6e0740c90e5c8d0a9af04a5e0ffe0943bf6e0d2c3d5280"; + sha256 = "42c48753d41d85066a2d1152af29d59e86945eaf8928726670fcc77f880baf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/mk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mk/firefox-119.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "870768e901c2f900d25a547d08413a612f01dd2935988a2f59bfda8fa4184544"; + sha256 = "563c1c0e5c23b3249095cb068d70333b3ebb6598f5099f32418b040c680475ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/mr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mr/firefox-119.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f2cde4a376169be38d3bb5c7e0585f59383a07eb63a1fa840bcba7c6f452d4d5"; + sha256 = "69702f953054e70572b2e7c4474641ccc4df119d962a1d2341cd898d943c88b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ms/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ms/firefox-119.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c680975f06962d5d7e4ece1d6b566a4863ea59b009bdf7ce00f6b548533d63b6"; + sha256 = "c61b592b5aa9a8863fe7fc7950d72701698efb3e74addf19fffebe6750866fc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/my/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/my/firefox-119.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7dbe7c8066106e80be4acb553d6b6dd3c8ccaeb1d8eadb141a99330d969a7ab1"; + sha256 = "18428c4c73468594cd9c2c22ce654c028d3c1f9894f37d263f79ffc222f092c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nb-NO/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nb-NO/firefox-119.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0d8e3c89de78f607f3b3258f9e8633792a8fb781ee4019bc5c4dc61e8bc4a276"; + sha256 = "f2989993ea8ed110ff2cff4eed467a03156ede2db4e87864f7750006bc4cd2b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ne-NP/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ne-NP/firefox-119.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fda071dbefc7d999d6e6d46dd9267d4bd08d3a124797183e6a5ebec5e357c411"; + sha256 = "e78b3a70f1c71d8cfcd3f72f5c07cb6ca3f2b31b9c25c616db518aa9d1d9262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nl/firefox-119.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f7b66affba5582a786086431ad187fdd5818cee274333447d8461d81fa120788"; + sha256 = "87027a0b36cdd388c0e16048074655fdb55a96f03561abb1760adb015a10df80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nn-NO/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nn-NO/firefox-119.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1e8ae2c889461f16d776ef816212f0230cc71046ea2c42fe50f294c17d346069"; + sha256 = "20768f6e2fa0abf0d0e438c7899ded5811824ae5bd1474f978526a8424e423c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/oc/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/oc/firefox-119.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d3e8c4ec7ed58550a42c58c78b930114def4c31e1e9541cd2e1d93d1f8ed6d22"; + sha256 = "63ac23dbe4886a07e0443e1772e5b3578ea1d4f5043064e02d179e2255c68fdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pa-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pa-IN/firefox-119.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8445047117de8e1a136bf08c3c7b12aed9486d5b2ceb53b515198e5dc9ff6912"; + sha256 = "22d3209d47e2bb368f082b59c9bf674ac0ca3bf7f458361a0d2ed62a05d0b39d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pl/firefox-119.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "87d29a11b54e21884be4f3bb3005d37cc2441220f9d8bd8fbcac002d60a05aae"; + sha256 = "660839198b7cf81d943e0af33ae5e2d257c68b2c4f9d5f4847029c303bcd1a35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pt-BR/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-BR/firefox-119.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "425f86111d409a3bc2250b68588bb92221d7eab575064488693a8723c78b97d0"; + sha256 = "f9dfcc38f180ba7f0a68e276ae32ce4f30da1dea5e41fa1c651994e39a2323ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pt-PT/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-PT/firefox-119.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "eeeeb25dd197cd2b194f9378fd0cccc6aee4a22a841e9fe87c34481e61a5bdc0"; + sha256 = "41fea86dfc01560fa02f112ab1458fb2513e214f5d311ce3f73d3dacb23f0f98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/rm/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/rm/firefox-119.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7842a3cc0cc9c882633377f1e18a8c7339af2912578cf5eadf12ac05cc44cf6a"; + sha256 = "4e59cfe5e937c5d4c791f2a3085353699274300641878c0eb6ef9e1c008abe7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ro/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ro/firefox-119.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "05f930e45de7537055a76dbe2148a7557907293e9238ddd8b81335ffeca85457"; + sha256 = "54b01409fcb03542b45eb5913494765685c732c25e070d107e8df4ba9084e87b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ru/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ru/firefox-119.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ef9bf25a5488e03b699add0308bb3b0b101025b533f408dc88b2d37777ee4186"; + sha256 = "8df2fba5aef8f65bee4fcc0db8a8f809c65d5da7e631e378841a5f7f6a1365fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sat/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sat/firefox-119.0.1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "034813361992a52b30ddebe013c221f06b6628bb78404916bdd6eaa7e0e02c6f"; + sha256 = "0c7e22d71463681b6033f8e783edf05199c1bef26e80143d03b85c5a013eb09a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sc/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sc/firefox-119.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "7795f208a10e91d4ec00b7605bdb55242a085fa11a49b6c210ba87f59d1b1873"; + sha256 = "d59f5f0012920790bd575de2fa03175f350179e728e3f2b39429db5918cc4c87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sco/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sco/firefox-119.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "732f8e5fd43e5be9019c3d4f1eaeb14dd05bc167b2a521960e1f984879e996c9"; + sha256 = "fa3313e39e27e83d7c7052b561ee8b16e5647405c712d6f9fc180f5b79354687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/si/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/si/firefox-119.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "aaaba267bf52680a719360b58c1d8a9f74e56c88ff1c790a238a7db8e7811fac"; + sha256 = "f0f6b7610bee29b293dd284dc2c8bfc2a8e823569603464772413cdd0215ef0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sk/firefox-119.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "562fed5652761207aa61c6df3b87538bf1b95018097ea7fe2f7b17d803f4207e"; + sha256 = "34a45a30785950c7dafc86a704f12e0ad452fdd8b685d98501eb472c87a35c18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sl/firefox-119.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "250383f4681196d5c3357a4ac4a0ba0edd58ea89e529a62e92a103e21761489b"; + sha256 = "4f554a7428d4ee3adf7c781c416ee56725fb17a976fff2530823b9352a6341b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/son/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/son/firefox-119.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d2f8c73e7030a9ada05d3da1f403bbb05b16a54e7affcad1fce196c739b1c93e"; + sha256 = "031c62d2d5451ac522b2d7760bb9f8f74cdf7afd9336b1f1c3a43dfeac1260da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sq/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sq/firefox-119.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "20fa7878cef8ccf9b877aee793638a30b81e0c89d609cf72bcc3d185ac8ecfa8"; + sha256 = "00c0ba4f17fb761b3646eb4e9c224cc43af4e763ec660fa9cc4fb273e9802dca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sr/firefox-119.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ac7149159ac83f91790a53926c874ac4dfaf1f411951a3a5eba63a500324b30b"; + sha256 = "0f413e14ab17a324e35e582a108c68fdf7c19f5dedbb94dcb30ea724c1dbc7a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sv-SE/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sv-SE/firefox-119.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b86cce597d8b3130495d676a28c5440732c0089f040b0f28dd9381dcbe1598ef"; + sha256 = "39bab6f47250385f85c1555f916689c40cfccdd64ae0f433a6cc74eb6a0b7b3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/szl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/szl/firefox-119.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "75770fb197dbcbe8aa473ab7e0bcf2474c4f240917f4cb743c3119724770382d"; + sha256 = "ae2e7059c8612023a4a1f0d8b5ef816243e7472a98487bc415e50a5d974e9d71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ta/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ta/firefox-119.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2395da544f587e2d07578b122e92de14a14c6c4fa90e5e25d951fc8060ef07f4"; + sha256 = "a3e60bd086c3899f45b6b8c39081dc3dc2933862d2d789162a876e65e5c69e2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/te/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/te/firefox-119.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "2661e1bff3f097a1d9a903ec6f4778dd1c111e8e81698eeaf9cc26a18c937720"; + sha256 = "37ec9536f4546d723d7aee5e61dac25ba0717669b7cc883a52e4fe6ced99335e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tg/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tg/firefox-119.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "7aa7e780ec6b8d4b2026cb5c223988ad5022be484350f320a6780c7788b83e62"; + sha256 = "0703039b5362d9023c4c4ca70c5af46086fdd427353dbb8458aa3c646ed8043e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/th/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/th/firefox-119.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "28b55df0316d694acdc5e14e3dc0f4ad75d54246dcc1c5eada5787a3cbae7007"; + sha256 = "08cada5788a4436d03dd9fc1f19303886d76825e000f7242717e0fed9800198b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tl/firefox-119.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "0daeabf81bd3ef1f79f51db76ae70d2ab82c9cedcd7b8e4dcd27668944e4a4e9"; + sha256 = "09b9d91554cdab127a9be2d08d65e801c04be9645053fbd7155ef0c08701124a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tr/firefox-119.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fdcf18ed645299e11365d713d22fc554da4ff4be8a33233262c166ac1f4519c3"; + sha256 = "64e057a8874bf3f4ee83cb2c82e8f355880b7e05999055ac9e3370371988b5b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/trs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/trs/firefox-119.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "18f547adbdb52f61ac3db408ada06ac81b59c0be19b8826eff306779f70df5e8"; + sha256 = "2fc9c15c5147e7971bf1bd9e521e20a34a449c6063e426a4b102dc067a690ee3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/uk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uk/firefox-119.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0003f5e2e6f452b20c67bcf7fdc314bca34363f18e642ae375635102530d5e46"; + sha256 = "02b726c51b634ed7181b772b77bf0b5543dc77727563e911ea10d381f2ef1efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ur/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ur/firefox-119.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "82c3ef7c208c7cdb44de5d09456e82bdd71de1321d8398323983d9473cc9e488"; + sha256 = "52749b68b455d4a1054c00b75185c18bf05807716b752164559a995b4740e00f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/uz/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uz/firefox-119.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "43f93fcf41dd41b70dcd75a2eff9f8d9db5b56a62623fe51f2034d461c5be60d"; + sha256 = "3f789d1fef8d5729af3c3f53a7701e543fb3da9eb8dee6c48c9bb815e894a7de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/vi/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/vi/firefox-119.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "662ed24018c950f0c11adfe857046256b94a312faa9c945d3d2e752f1c8ff6fd"; + sha256 = "4b9a103512983340a3c3d51da4b0044826cf8e22eae1479d06a64e0b3827df3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/xh/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/xh/firefox-119.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2b4a67692ed2d88139b82beeb582b054cdbf773c1d67a6a112710da6dd5c2d51"; + sha256 = "13073d443f3491ff828c913689f0b32e1ecabe707ee2f76f6a0fc66f28b3cf64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/zh-CN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-CN/firefox-119.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e4432e793813e4ee8b07b7fad53fc2c15de1fd9617a33466cc87c2d7ea4c782a"; + sha256 = "40a6787e1ed8d39b12e494d33496b718e19eb354c7d9b0bbdffdc438978305c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/zh-TW/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-TW/firefox-119.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "93508a741d87d40b794f0529ccb6abef895cc8063b7c9791e89e41936eaf4e1e"; + sha256 = "800d19524b1c62c02da3a5116b2f5207ba0e238a30735bc10bebdc3b0e55fd97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ach/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ach/firefox-119.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5c1c2ed270695990cdb41ca40370c0b3bca8ac1a0157eaa2e78fb4afe7883d2"; + sha256 = "995e3b86a9f1365014bbc3c9e34c3bbf7c8836e36ed16a0cb6e872416de98b9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/af/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/af/firefox-119.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a01356f453f0fabe8d02c5e4d810c1c56efe3c0c04af986fe23f53ce338eaf1c"; + sha256 = "e519b620bd95162697511d1e1e6f8c1fb623dc661feb4b9d94db6cb17c318d28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/an/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/an/firefox-119.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "089748a093475bff39e28774fca3d2ee325d9fae03b25b42ed7d9094ffaa24ae"; + sha256 = "2b44a7eadc3828627d572d5354d062cdd1a5d8ba545f2e69529d6d4375c4d367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ar/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ar/firefox-119.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ecf8e9df1a96f9db677acc2b51435c61101839b5da5ccd06a51787a414406e07"; + sha256 = "e1bbfdeef1957926e0a2d849a483f5d1d75d9d29dc3373845ed19433104525ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ast/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ast/firefox-119.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f592b92c90c131f0811c6114c43f77a3c39600cec07416bb76ee6caf82b8efe"; + sha256 = "43a0f6f95ed2dcb0add16ba4b765a164614a81a217b8eaf1f998aa0d89ae7417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/az/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/az/firefox-119.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d57c232fe0568b696196f16e211f993027d354fd555998d125d9468f8c77442a"; + sha256 = "d8dddd74ffdef6fbfe9924e6fca9c8b436130e7cb17a184d682fa93d4fdced41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/be/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/be/firefox-119.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e4f83fba365fafdb4b6923bb7e74890b2208278e0bed94504ff4b9edb1ed5fb3"; + sha256 = "f2a07b563a6d0085ab68b58bea9203a3573f6f0b4e673e7f0af34f0bd709f607"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bg/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bg/firefox-119.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6ee691106c0db5dc35bb4f14918e4d4cabe67bc4c0b9fcb2048adda902054d68"; + sha256 = "6257b89abf9a07176b48f6b8089bbd1a9adf67c2c15f778a11d95e137d3eb987"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bn/firefox-119.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "965afc86cbf57c043f93326f52c9d53dbf854f1150c5f11d8773b27ee0b736e8"; + sha256 = "c110e7b0d3b1e8f21a3c6e8ff3c25341c66def3c28aae3010a73f52f02dcfd8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/br/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/br/firefox-119.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3dc242d4fa2b10f2d0cefb44eaf3f6777a08f9bec38b196cbc27c5ecd0f13724"; + sha256 = "fcf3dd819894dc19c6dc6ddf836c6a0a73b1110487489f3247f816a7d8e9780d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bs/firefox-119.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5b89b0c80ee34858eecaf569182d39fbbfcbb4378075d9be3af5e20d3eddbadd"; + sha256 = "c8903eab5082b5fa8eb5fcf24dfbd0d8f244e1cbf3e79d4c826622a2c6e2e385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ca-valencia/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca-valencia/firefox-119.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a3b0007731d232139441bf087b66d3226484bcf1acb816b1efc578bc9e7bc821"; + sha256 = "02ca7f29bee2e06af0dfd4757beabbf82e45b77e8d3fc7cc544f93d5776843ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ca/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca/firefox-119.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4024e50d07aa8ab332b3e2cf3c55d94d0fb563ef29dc14b11ec42b21e2e8a3dd"; + sha256 = "47d743c84c6e3e507957ded5092c6c7d67b7f52d9eec4dfde65dc2640ec3af1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cak/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cak/firefox-119.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d306e095f1f1021374024ae564d82c47a16e34cd05c9a51dec71b574838cede8"; + sha256 = "368237495ce87e0e5a249421a0643d05d02bd44d1138b4c4c614eeb34ec44d7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cs/firefox-119.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d2184a3457e444f982fe3ae512f8b062a0db9b1e1c852ca59f8595b7c884984d"; + sha256 = "d4170a9b18003c32a17144c5819e7481d610b3133363008c21c905d11f9fc752"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cy/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cy/firefox-119.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "73b3918642eedbb3b65f53996a43cb244c516e004cbf37534d4c48d8adf48f83"; + sha256 = "75d2be292dbd8fffe3b6b92002035f7e42bd2dec6956e449973be88bb0debfc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/da/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/da/firefox-119.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9f1a123bf057298f2fc3799942b44b5e5db3211128f76de22d9903e4859401e7"; + sha256 = "22d42d3ac8be47c35f97bbb3cdd41836b7e0a0409617e192955c5f5cd96266ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/de/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/de/firefox-119.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b0e68af0cebf4005298545f5e6b0c326fa44ce5a177e5b7bcb60248481cfe96c"; + sha256 = "6cc88df9de046096bec39504e5ecd2d3051ef4331e369867c5e6567acbf65cc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/dsb/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/dsb/firefox-119.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d07aa90bec4c9b902785d28724963c6a3ed33edca737ce1a49471ac073b58241"; + sha256 = "a81f9efae2e4a769be060e286b8bee0d00569c0a53cb839928d46c96fe65bfe5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/el/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/el/firefox-119.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c78872d539d91bbba9967da21914e595f5cb70dedf8c60c81f86d856049df4a3"; + sha256 = "bd4ebea36042e849301bdd843e482d50930d8810fb5d32947fe4511de48008b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-CA/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-CA/firefox-119.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7a8d68ebbbe1f6a3e012cbf9087f0e5fd71a27697ba7202d2911d32c2d7f5bf3"; + sha256 = "2e6a07daf47d70295bf39aee8bad62ea334ecffb29f219b87ccb73521f3ee3f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-GB/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-GB/firefox-119.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "90005f2fcd03cbd2709e80f35e39026467219d96c2febcd6fe2165b44e4af3e5"; + sha256 = "0585fdbf94e401c00e291bdd22b3c137ee0effbc287ff44f2d5a6b6bb9df6fc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-US/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-US/firefox-119.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7ee426d7b5e818b465f581e2de1eccf9b51a22ccfb11bb2029a7cacd162d1af4"; + sha256 = "c3faa5a469d1397090d3159e5a336a065c9722f94bbb107887805b0d62b02e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/eo/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eo/firefox-119.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "b29ab4e7e52486beaad58f9e3b5d4bc3a2a9c64148393edc78aa2e000ed9dd63"; + sha256 = "0bf1cda5b3bcc8bf0c0964e5826db28a13705a969a0e6dc14a6498d62e167422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-AR/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-AR/firefox-119.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "17e1fa5e8625a79e29a1f0a4f5a1165a23ff7229a00d9224d69d3732ad70e873"; + sha256 = "a8db855598b21922a3f8f0e0aa70e96b27c9f4164906975195094b024404053c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-CL/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-CL/firefox-119.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a38a14173f04083183aafe02ca15171e1741cc6d31b091ca8a9292ebc94c6b74"; + sha256 = "8aaba2eab96010c531fc3c13e0e11b3ba31aea1ea275d22d2d55ed91d204d8ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-ES/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-ES/firefox-119.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "36a9cd379370724daebff6df4f71ba5ec4c17295d30d8ebf97bb8fa89029c75d"; + sha256 = "fabce87a93462cf25e25435aac5b704d2921d9fdefc44f9d9ae1a5fc13e6d895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-MX/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-MX/firefox-119.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "af5bb98b2a4ae147315a5f63d88e9fa23a93ec9e0bf1c4863f83b636aaee6c85"; + sha256 = "8ad782b622ed063fb0cbc6f509fb2edd34537a0096c93ef3f861259b5166ad41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/et/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/et/firefox-119.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b275483c1356b84259016497f421959d335b4788a862a4f4c79a079171917d28"; + sha256 = "48d3c7ac37d505e1734190267cb107bbf72d8286a238532da1b86cc97494e533"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/eu/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eu/firefox-119.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "227747752cd5a0406190986db8e434455b2212f57b09c291682b5ed75bc469ad"; + sha256 = "f9ebe4ff904ffcc0545d375ef1595d99d4253fb171780a569b4610958b264946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fa/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fa/firefox-119.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "34235d52c8b81a6c784d76a45aaa6743c94f3d941f4dae4d224a8bfc9cb5e27b"; + sha256 = "a65eb2459e5b2ac07c485ae142ee67a56737c309efc055d064c5b1314d01277e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ff/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ff/firefox-119.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "8c2e0ff48c32bda68708400d07512fa56774fd16608a4dd682bea7f9e1d6cb91"; + sha256 = "01560cdc2d01b1b8423a68698a4273870103c2c4e6d34990813db6bbb2d417d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fi/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fi/firefox-119.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c3a78941a36573c22474f0be4882e831893380dff9b1d742489cf6889a136cb1"; + sha256 = "6a9ee52625a8add941f2018c53abe1596ff8eee2d532b53092ff640af478d081"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fr/firefox-119.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "21e5ac594c682a210cd14944c9674a35eea5f45c47c1b33c43e79a279eb04a1a"; + sha256 = "f8ff14ecb998b4945041796e189fb87cf309079b922cf397c05eeec2dd2c9a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fur/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fur/firefox-119.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "acfab957500437f62d8a90b40e568a0e616d3ad52f6db984c1624e228dc7a577"; + sha256 = "349a4b860435c0d65a84a12e074d11209b3f0ab8856c005e5131f09cbfed1900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fy-NL/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fy-NL/firefox-119.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c84b7eae53b29265bc37dca53d9f8ed374ac225e488ed923ef125ef41b9ba67b"; + sha256 = "8779f243e0918de79039734a6372a25b01b9a5c9ef2e01c757309237d588a694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ga-IE/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ga-IE/firefox-119.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6c8cc765c33caecdf8db7fc0bea6094caa7344ab5c5301bec6cf5248b316ee62"; + sha256 = "21b483531d4a91e920fa5ff6a9f267ce835c9c5941c1af913021f5cbcbdfa84b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gd/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gd/firefox-119.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1d9db92cff230170d7271e57d0c76148fe6a8ee20531bda73e8c72f6b7cf2aae"; + sha256 = "fbf5fb03e13a8b9eddca4f521299ca620570b48ef11bd34ef6e37643f3280cc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gl/firefox-119.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "344269ae91ff0cdeb4ae9e04cf3628a6f30ce97ff67b64578d79c618d5a5aec4"; + sha256 = "0fbe3e59568261b7f96805a257df8320690d3a9952fa421228ade5042b42f36e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gn/firefox-119.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "96b9f44853921d21c7510ab029cd8c55f7ac628de0802fc3e6dcfd7852857304"; + sha256 = "1b35a1efe2321821f26fdd97c414145dfbefa7b5fda8ca94f8d9c7911ced9bd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gu-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gu-IN/firefox-119.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9cb60dc534dd3e4928a2bd9ee2f7c19fee613781cfa8fb84c14cc77da6749e4f"; + sha256 = "5aa7c4f18a983756d45b6f8273bf6f73449e28426616aa32f5092e9b67ba0d79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/he/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/he/firefox-119.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3c844f9980014b146fe1583991ee53907944266a86b862351e23b27434b975b7"; + sha256 = "f777ee429354b7e2facf45057cd4552493fcbcea52a4afd298555ac87306f692"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hi-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hi-IN/firefox-119.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b228b0cd269ec09c57c461f4afa57530c0ec61a15bbd46215608feffb631c01a"; + sha256 = "74ed18e2f5f8b8d443df42810f849dce6339343566c32bc2cc6a82446680217c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hr/firefox-119.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a0d088e6802093acaa87d1e254ce5048b55fef39e7c0e838e389f7b4c2629abc"; + sha256 = "3e5a37911a3013b46e1f801e4f4c21c304594e4aba318a87ef29a9be5a4da687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hsb/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hsb/firefox-119.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d7083468a49a9e38a6f1f5b45c6605a0f02843057a74c4f38b03d531c2c79f5e"; + sha256 = "12c8a1d884b6bd2d056a1c44debede068e6e09dac0e871894b89150e321f94c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hu/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hu/firefox-119.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "359c893821d78268ef17d84bdca4770af0bffcf1b410e67c3694effe2eeb065d"; + sha256 = "47529ca31f8c81eb6b19ba99552aed60c712af2337ae0af473e212bdbfaef29a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hy-AM/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hy-AM/firefox-119.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "511e1898738fabac4a24ec52cb7e6bfa07779bb8138624f298d4607eba43df83"; + sha256 = "6cf788b21ca4608605b1ce539fdcc0c7b8610f4dbf98109b8ef0c3b9d80d8fb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ia/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ia/firefox-119.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fdee380e522e5339b9fb79534761ef79bcbf633d1ce28bd90f7b99df923bbf59"; + sha256 = "6fda520cb8df890a9404c6a71fe0ab813e7b563d2d084bd4cd77817d89e56271"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/id/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/id/firefox-119.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "049d3e5e015f19217831ca5f73097b4d88217b2acda57d501568704c58744eba"; + sha256 = "38f2a22dc6d96e52130141982c7862136d001e8bbbe9f337391019c34690b126"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/is/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/is/firefox-119.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "63b29fcd76565a521ba39d816d86e98fa9c2345d1d9f9ad2e0223b100ab6aaf0"; + sha256 = "1405bdfbd59b3c4c8800f4191f1bde2f47096a37adf8f66d6d3fc881c93ca161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/it/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/it/firefox-119.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "15003e0970f03c566f7e8ba81ae211106957447d8f779ecb2edd363c0499e0a2"; + sha256 = "d8edde64459325e81b51eb197de89018d107e427963381dec0a5ad54803ef258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ja/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ja/firefox-119.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3e513ff795ad0fed83b9b83294a31d575853ebe681110db05529b8b39d328c2c"; + sha256 = "9c2bc20554ec009fad6bc7e0904f732fffb2f6efc2de1314ea7660547ed2b085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ka/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ka/firefox-119.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "cfbeab366980e0f7b64fed447503c476f227fefd1dfe68e7389421bae51d680d"; + sha256 = "86a9e9100b0a482b4829bce83160a4a4adb06b7b91fd91a55004f7418e8949db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kab/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kab/firefox-119.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2a9764f29abffc179144dc891de76ae55bc0566a9b989d5f68c4078e73295827"; + sha256 = "30a17adf1a960c5470d44a2cce09dcf804831d9cfba332c75d1b77655af95b70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kk/firefox-119.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8c0ea00720e05d12dbfd7500f6f1ab34d0fbeec02cd0155d58070b6de810130d"; + sha256 = "3bde81c8d3e371eeca249b48a994fd2fc9f478ac6309f0ee5283a8425b30db05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/km/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/km/firefox-119.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8c1f8839665ec7bd802450c3934bbea394346922cbd1a5162ac8ef31672b6909"; + sha256 = "e05a943bb6b2c09982540cae733e81f1a9d363958a68040ebd657da5ac04845a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kn/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kn/firefox-119.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3f7120ec13df4b13f39562e0ec9da4033f655a2a026e37eb053bff7e7ec71e3c"; + sha256 = "17e9357334834134002f710f61db6c609240b35ff9f5116bffbb01488997aab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ko/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ko/firefox-119.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6bb3c61886f6f3ee07fc8e668d54e3cfa2d82487a51ae1e8090c8e07df2ba74f"; + sha256 = "2065b72bf7e8dad9852d8f5471bbb37241cdf6d43594cca3eb41c4c4d58aeee6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lij/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lij/firefox-119.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "22ef5dcf3706cc39bbf29adc00f8d311600dfcf6e6863348507cf658ba9e0d47"; + sha256 = "4dc2aef6ad9477c9708db994956485fb006264efb300f489fd4fb4ee25f8847d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lt/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lt/firefox-119.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "de443a2361af84f8f3051c2d00da99dcfdc70669980d59409cc9c8b74772a182"; + sha256 = "be49d7c71c76dfd36f8589388ce977c915780dca80b239b0731df86afdf0b669"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lv/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lv/firefox-119.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3ecd36232974b705eeefd728d411926c1c92cb0a450e45aec636f884b9a25f9e"; + sha256 = "7939ebb3c3965d4db86be9516833d36968448ab188734ef7991f47c7dc307ed9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/mk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mk/firefox-119.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9530f8bfa744772847988e945c70fed2f6e79fa3013d59ead836477fded6abf8"; + sha256 = "e37c008b774c8e4774bba59a25a29d8df2e63132db6e0762a00da60f7d374f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/mr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mr/firefox-119.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "b69846b1b93558687b161c6b6a65a36b71b5cb9d483c4bfe83ff3defb4fec739"; + sha256 = "fe38e4ee96783f3df61d92b0405e447286ba9a85ca84e048621e3c24cfa04166"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ms/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ms/firefox-119.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "85484d41f6de8cc019194f729682073c40d550ca87d28433b31c5104d35f6746"; + sha256 = "a0429e6ca5bfbcc297212defbca30218fe8e91a33feedef01ee99a339d7bd63b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/my/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/my/firefox-119.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "1c9071c14396aaf34b2221762aa436103ac0e12a40b42f9908ea887c2760684d"; + sha256 = "fb138fd185638cac7be3de34f402b2810e2a133b322a9d254ef8ee9d9294d208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nb-NO/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nb-NO/firefox-119.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "56a04b6bc327fe1b2e28c7da603596c7309b559cd22bdf1d6df6e3c53a6a1c96"; + sha256 = "fc3e5f37199302836c7fbbb4747fc3a016486d3aaf632f0e79272a4c96a59143"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ne-NP/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ne-NP/firefox-119.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0765df520a6332797b8da6d91cfe43d2d499fd2a9d1d550f1908a234f8f8c0dd"; + sha256 = "978478460a0498d9a10dc118545823bccd3a52d7dce88f36badbb0df08550696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nl/firefox-119.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f10c04af0177e1e6995b4b370ed000f7ae9db9a539dcca8e098d4263d4d58585"; + sha256 = "67930465d612df84ab140ac66d185077f8ee314290daaca9c6fcdcba5f21c817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nn-NO/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nn-NO/firefox-119.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "218e6405bb9a0484f424d88af19475e0838a5f49b793377e6a8886f232fc90e1"; + sha256 = "81e478f2307b10cb71854614f089518213d061d1e122e6ae6cf3beb6b5c84c50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/oc/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/oc/firefox-119.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2ee964aef5edc66f602537e70d107df09625d5e872cbfb66b2a27021f98c6c64"; + sha256 = "6cfec951a0b99743ab2dc521d27bffb50ce2bebff2de6196c30f33eab5187c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pa-IN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pa-IN/firefox-119.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8b0ba60b30197627022ac2a5cee233a0f58c3b3eb264b9d803196aa6a625636d"; + sha256 = "6c7b6f3c5a0f871395d13285ca5a4bb0c0415726cf9909fd86151c014f770c2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pl/firefox-119.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "97008357b685110881ccb178877b0e82e10e9c6a7a6a102829791c375facab48"; + sha256 = "44b28cdb9f11948ea6f00801f988a21a2df943b17b88292703de5641abe6b471"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pt-BR/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-BR/firefox-119.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "875ffc30562361411ea0652259193bb815db19e14e85b259595bbfb2ab35aef5"; + sha256 = "ba8db08a40fb15570b954da9b5b6e7cddf3138cbd540ba6fd221a2d3d2d9b544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pt-PT/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-PT/firefox-119.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "eabef633ed71284df0d339a9fd6d9d142bfd15f71e85958fa2ea6c21d5067088"; + sha256 = "8518cc89f5d0a8f0a714c3d15b1ae0dbbaa6c1dbb47b766f98e706ee5c9fea8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/rm/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/rm/firefox-119.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dd30d7b7e8b7fd388856841a5291a96ae70a61abb683a922ae6c34b454effc0e"; + sha256 = "56fe885cbdf01c1c53e0bcdaa74fe8a9b2fd075d4050a197fbe872dfe1f3fd1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ro/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ro/firefox-119.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9a5fb9896e80bdcc4d5dbf9597121bcb3beb869f060191ee36c51ad1e850e02c"; + sha256 = "94474a1992ef8d0cddb85e698375d7df43736325e28ae2e60f94299a9cff5079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ru/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ru/firefox-119.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "211e864ca9abb665ab7c1a18e811b746a3bfde9f49fe065651cc2042b6bbf522"; + sha256 = "f9e70b1b61c47850804f9dd4c8a907ff81599b95477893c42e4f6a0e6588092c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sat/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sat/firefox-119.0.1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "8651d750d4446d32664301d6d9e7641a6c98d2795423cb57e4a7644b1a280d0d"; + sha256 = "e2bd85382eb4bb006518e7a37692e4b11d33bcbddef43fe1636465a94f13d07f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sc/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sc/firefox-119.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "02826300bcb7106dc1cfeaecfdc3bc7ec9539dc8c81eb95b6a950795059e0805"; + sha256 = "e3b7d6a2d10f9da0b11fc01128ad1cc3c878e90260bb906b1ec451f8c0160b36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sco/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sco/firefox-119.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "409d8ebbbbee320d2d446c5978fdfbc8cdea259918cebcc08c909c82cb281140"; + sha256 = "5c20827498ba6ab0ea1b6299796479ab3af2685d64248166c4aeaa34283837d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/si/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/si/firefox-119.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9f689881dd71c69b36b48c383cdb1683bd06596b57491526207ad3036d16d52c"; + sha256 = "1d6ac6db81135b96f5940eae2b14a375ff636b0ccf5163e7ba198739a35c977e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sk/firefox-119.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5ec8fb3d368f3e4e21dc22e9be79f4feb35fa0148012e4064a79b8990cf57bb7"; + sha256 = "5f1cc60c2fe7ba2e184de94ea3552a84acde3bc438dae2afbca245af27ea1060"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sl/firefox-119.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2f570f27edd24c3e8d996e342ce74b2ce0ff2c591d5bbc3624077cdc5a57a8fc"; + sha256 = "3942f5597ee26764f55eb1b5fd8a3ef656b94ed4630067042ae3d6cdc35a4a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/son/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/son/firefox-119.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c54398747780e8e8f2390d4b1432be5e2bd8d859c586d754bf53ae3956a5f397"; + sha256 = "9a0aad56e659f09f65804682d902767beda5955215f794c3b07b0a94a0ec628d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sq/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sq/firefox-119.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7b322cb127c458cc116de76890c1857ba1be779a75c3109d900e3d59324cb36a"; + sha256 = "a3739cdfd849de74b021dde0aeea27eb0dbbf1a04f0481ff4adaf7eee4fdb615"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sr/firefox-119.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "3a199cc608b12c96658f2fad08714d8c996227a9c2684e4ed65c171699e76722"; + sha256 = "68a0ace6dfc11e82c7e5ebe918a4d5c975897beb0f0727a2114089e2eafc077b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sv-SE/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sv-SE/firefox-119.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7cd8531661e1e3d73e0e4bca9bf017d2842c569941d3d51b4d93e875bbffdd6a"; + sha256 = "9a67bd82f39e4af0801b24f88f6f6bf92ba5d85031de2098fef6b2b9d3593863"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/szl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/szl/firefox-119.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c1bb24d2261165def15c66e380dbb6d6ff4c6802f6fb91987e2a25a0542902c4"; + sha256 = "7a4da1bbd23268b52d82fefaeaf67f03d11e3b295d5811107de8731269ce98bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ta/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ta/firefox-119.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2273897af354a0a3d66608dca218379586976742e2344b0eda49514dba4c3c8d"; + sha256 = "e29cdd9028f07d00853d5c29a574d281218be9c13e2fe0cd8b53b17cb6c1b006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/te/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/te/firefox-119.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2d2945ad65eda81031b27720e3d729453a1548e91b58bf8a378c52ae18a0c1f0"; + sha256 = "a34da2975dca94013bf7152ca9d3029f63fd48be602088cae64d3eba844029a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tg/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tg/firefox-119.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "9ded627e8cfefc2ae50607ffff0eac3c21e3256dc2b086e74bb259318908df48"; + sha256 = "4602903e4dcfb4ee14fed515188ef7856f30bba9b7d7a0ee3e3674e9242e9e03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/th/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/th/firefox-119.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "30ca7ae93bcfd8c577db3fb34b029eb7a940486f4672f5dfcc021cd9bda087ac"; + sha256 = "805072c3cfd004060f20334a468467bd7c372df415f24df35e97a1309f2aec13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tl/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tl/firefox-119.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "361c229f5374b36741423b416bab348ff44329737c89e077f9f3a6610b450ae9"; + sha256 = "8a0da3f8c4aa05db9e08c4bb95587a1347a38fc15a5d500569cdaba77a8f0899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tr/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tr/firefox-119.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "85183fe5a667755a35e34581b4dd47a1cefed6f9db134eb73d530bd09eacf10c"; + sha256 = "9fe74282a7bf0612e6172dcc54a5a65915b1d30fd5a1d18f193a617a5be6ea1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/trs/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/trs/firefox-119.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "40248dd2e4642f7100f4713e1d4b79a632c889926b5ab36571cdf753c780186f"; + sha256 = "99056931998947015e7fef2cbc432dd0ee565d2c612e0a35b2848f06987cc322"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/uk/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uk/firefox-119.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "10d93be092d85ace9549dbab2ee86e9c5b672542c4c85265034c3482d08021c0"; + sha256 = "4ed96af94b077ae2a660f10c2786344da83ec513706177793a427b2bd943332f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ur/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ur/firefox-119.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "08e7f68c05759df1abdb7b6196cb10b0798e7af1ff659a17aec259e9a9b6a843"; + sha256 = "bb45d5109de54888df1c051d6692f337b87cbccf897f0b3a6ee475ef9bef9e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/uz/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uz/firefox-119.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "bfdc7e8d348cf0306ed591d46b2dd60d83015e9ce6688d35d0f1a59e0904d750"; + sha256 = "9e053e07a72afb8fa4975f06e3fdcfe52c85777a91f0262e8008fbd906c4a46f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/vi/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/vi/firefox-119.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b3c54a453345e0331f5d20693eb9b30eec0c8313c5c6d952e8d9369da970d57d"; + sha256 = "5369cebbc2a94c29971f53a50b77666845233982d9fee050ae5111440a12d276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/xh/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/xh/firefox-119.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "56a04a202bf58cdebc18f33dd79cb64018b32ae288d64e00e9b30b9b49269181"; + sha256 = "868c5ae9ec6c5f2efba92e84f5112e560bb3a1bf44d76dd90abcbf00fe19f1e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/zh-CN/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-CN/firefox-119.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7f765179cac4472b7c39e5c84d8363051c630ee310f4feb44c6022a68eec7ad3"; + sha256 = "4ce3f1ff7ea8b8a6d0af2fefd05c7647adbfa6feafcd788a38a1f149b2dcfb26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/zh-TW/firefox-119.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-TW/firefox-119.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7294e0e6eee46223ba9d9f133eaf8f2245a77ae6cb7795a09664592b473a00ab"; + sha256 = "a91f8b78ed240ca818661baedabac14cb646a8396a9983d46fb3a3df556a102a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8a9cc71d083f7..c77411b6c2647 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -503,6 +503,9 @@ buildStdenv.mkDerivation { preBuild = '' cd mozobj + '' + lib.optionalString (lib.versionAtLeast version "120") '' + # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; postBuild = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e58ee63d08c6b..c4d59bc2c1495 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 = "119.0"; + version = "119.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c"; + sha512 = "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a"; }; meta = { @@ -30,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "119.0b9"; + version = "120.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "11d07474e3ca72a4e2f60053882e09a215e0d29d6830d0cd41447bb67370118356090af7adcbacd7703ad9fcdda83c9f909419c86b8f3bf2eacd9ca3d3aa3f54"; + sha512 = "7ac5562ce393ea84663eac5c6ee1a0ca527ff4a8a9ec6aaaef37213ff071076846949e80af21d95ec8e32d3cbc740b772a9d7cc54965b7bbc8e015da22ae927f"; }; meta = { @@ -58,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "119.0b9"; + version = "120.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 = "ce3e2adb3171aa05c7af3b7a4ea25eaafbc109c522b90e26aad577192a0902000fb7d705fa5707a9a7d0be2ab1c0cddc5a98abbe6549e1377c0a1d765bda62eb"; + sha512 = "07bf1a58550e70c683719adef55fa3d1ee06876e0cb086c28242879c683269c4aa784b1dce639218b3ad24a546192088fe5224a52e13a0086f205ec5470e2428"; }; meta = { diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 7810db67afb30..afe766f841bc2 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "119.0-5", + "packageVersion": "119.0.1-1", "source": { - "rev": "119.0-5", - "sha256": "0ql4i6b4fvydiyscj8ki2pnzr67bmb3azpdm6kk5y8yyw2697230" + "rev": "119.0.1-1", + "sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7" }, "settings": { - "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", - "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" + "rev": "095f50ed91aa7db2de9c67763cf46bae09146a58", + "sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi" }, "firefox": { - "version": "119.0", - "sha512": "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c" + "version": "119.0.1", + "sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a" } } diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 79020e18b9f36..2ea777728f95c 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.4.1"; + version = "32.5.0"; src = fetchzip { urls = [ @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-c/rfnMpiLWqlNZppqPRNWXsgAQ1FofAdel5EFnK+mrY=" + "sha256-1MJ5K9Zc/BHeQwwlq3XyUV8XTFEpPytNyTnsDpE1tBI=" else - "sha256-27njFdqq2DUctlz/UOtH5tlOduQNpoapuCYS+48K9dk="; + "sha256-xXunZTqoc2A+ilosRUUluxDwewD3xwITF5nb5Lbyv7Y="; }; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index d9c9ed6165899..5090d3cf45168 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "15.0.1"; + version = "16.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-CU5PI+9iBcxZdhhs2QjfZTViU2xQ3i+T+4Wzp+yeKEE="; + sha256 = "sha256-bxzLduesbeVhLuPcnIJmZaVi861gv44Oos9VB8m3TCs="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9c56894a2f973..04de25c4988ae 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -10,7 +10,8 @@ , qtwebengine , enableWideVine ? false , widevine-cdm -, enableVulkan ? stdenv.isLinux +# can cause issues on some graphics chips +, enableVulkan ? false , vulkan-loader }: diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 82a31f3e5e2b7..f83583283d4f2 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -4,7 +4,6 @@ , dpkg , wrapGAppsHook , autoPatchelfHook -, clash , clash-meta , openssl , webkitgtk @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - ln -s ${lib.getExe clash} $out/bin/clash ln -s ${lib.getExe clash-meta} $out/bin/clash-meta ''; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index a83f1e1dfa616..8ef4035996885 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2023.8.2"; + version = "2023.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-8khwpGOBSpbAHnKeKFZUrJoE0dgQB3bN6Y/W2gwRfCM="; + hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 381cd1d456b53..d9af5c360d4c1 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "HyperKit driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; - platforms = platforms.darwin; + platforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 572c05e2a787e..8e3b5d297b785 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.26"; + version = "0.6.28"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-Tj64/8uYEy4qZISjmtpOGTMzgSkBB516/Dej6/biYRY="; + hash = "sha256-/ifr/sSaChZKRe9wCcjURhqZl2/JhIMewZSlJiit/7w="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 9c070a71272b9..928acfa935a2b 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.13.1"; + version = "3.13.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-HzamUAqO21RuWLLEfGfrpnlSJslyh4zAppCich5ZzD4="; + sha256 = "sha256-WXtEXgKco50D1TR775lIm/VuD+MJMbOMQpPC0W4MAYo="; }; - vendorHash = "sha256-U4adeMBruUje97rr1hHfiCxMWSXlqv+aAlsHZZ4n5zs="; + vendorHash = "sha256-kvler6o4On4SbFF7AvPSCF5fRYtPNI5fsOcUbrTGYcQ="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 0bce61a8591e2..54211aa5421ab 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YJrL4fLJnTkfzZQp4MzPZL8ZZOGhFbHUzOpvaA5JrOA="; + sha256 = "sha256-nnW0dLFPHex4fYJeBPFy8SP7Uc6cs5eN+dv0kIfCUYs="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index bcd553c117a64..308c5cd4db6b6 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.27.4"; + version = "0.28.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-SMdpjeMerIEc0oeNe0SfZyc3yQTq6eif1fDLICNceKY="; + sha256 = "sha256-qFZLl37Y9g9LMRnWacwz46cgjVreLg2WyWZrSj3T4ok="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorHash = "sha256-wh4WjfDBX9xdtF9fBjSLPBbqb6k8H/LpWO9eTn86le4="; + vendorHash = "sha256-TfU1IzTdrWQpK/YjQQImRGeo7byaXUI182xSed+21PU="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 0dff89cad4b05..2f6939347729b 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "kluctl"; - version = "2.20.8"; + version = "2.22.1"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-F4vEHzN44+d0EtfJukEq5WVm8aLVWqmT5Xcpa/DBPng="; + hash = "sha256-s7ADEWy3wx2hGeJzfXPVSBv+bAOoOQPsF75Sq02T/AI="; }; - vendorHash = "sha256-x5Zy8H7DzxU+uBCUL6edv8x2LwiIjXl5UrRUMDtUEk8="; + subPackages = [ "cmd" ]; + + vendorHash = "sha256-EEOVd15f1SK8InSIG+TuVwWibkf+ePJ5AGZpiMD+RaQ="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 1724cb60e148d..6f54075dc58cd 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8="; + hash = "sha256-JXI3hQVChM7czCwan1yswsrUSse/IbMzwXw0tnaBiek="; }; - vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c="; + vendorHash = "sha256-yiRxSJIIYJbkV3QAFclrDDnsBoX1t4cSRvGmwVgz/w8="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 1a27df9b36dd9..228b52e800cbf 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,15 +14,15 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-alpha3"; + version = "1.6.0-alpha4"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-D95YzliadhhcOx8gW+lhECiYBtezsS8rj0Tz/29azlA="; + hash = "sha256-JkYMGD6hNMcMYPXnFUm/6T0EfzeAfG4oQuyqcNv3hVE="; }; - vendorHash = "sha256-SbGdmPTJRSMDhqg0GEfdiQ+2Uw7xmz0Kcyrr1ANlKo4="; + vendorHash = "sha256-kE61inSQ8aCFnPf8plVRUJgruSFVOsogJAbI1zvJdb4="; ldflags = [ "-s" "-w" ]; postConfigure = '' diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index f8ff802ede828..71fd37a3cefd6 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.7.2"; + version = "2.7.6"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-+DqkYzRS1H6PGthljAqsmLAnGtKkX4g0drZiRh8b1v4="; + hash = "sha256-h0xr94DNmqjpRcas0F+UxQEnCHt5VGU2CRtv+GzJl00="; }; - vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4="; + vendorHash = "sha256-UBuCAIwx1UOh9bsk3eNlTOozB55RIvuKQ0P1WRkJNaI="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index a4270fbcea35e..5aae5e8e68bf4 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 3cb89329990fc..b496d5a801522 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.5"; + version = "5.18.6"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-zdfzGmEL1ZsU3g3jmkgOfxcIGyffkC9UeiU18jPOr7Y="; + hash = "sha256-PQf1gEFlZ6Y9KMQjKeXAZy/OfxCbiKfST3pr9xp0/vg="; }; vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 94bc2827ec9dc..b89cc624bd43a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -95,6 +95,7 @@ let removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { + fly = archived "fly" "2023/10"; ksyun = removed "ksyun" "2023/04"; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 589754a397bc3..9caf5d07ff60b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -425,15 +425,6 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck=" }, - "fly": { - "hash": "sha256-9QB2fbggCKcJz8tkSYgq/X8r+MB2M76VCWXgsHARTkU=", - "homepage": "https://registry.terraform.io/providers/fly-apps/fly", - "owner": "fly-apps", - "repo": "terraform-provider-fly", - "rev": "v0.0.23", - "spdx": "BSD-3-Clause", - "vendorHash": "sha256-f+Z6Y2WPxqJoHoCwuK6sgFa8nUnkW/WwrD55dtU0wtM=" - }, "fortios": { "hash": "sha256-RpcKMndbO3wbkHmrINkbsQ+UeFsZrQ7x02dv8ZpFMec=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", @@ -772,13 +763,13 @@ "vendorHash": "sha256-cufN4QYXE+bqDKLUV+Rdslr5CgbI0DvoFVWVQiBVomw=" }, "mongodbatlas": { - "hash": "sha256-aS5TU9xnevgjK9TH0J4nzSr6ct2Cqw2Wa+d+jIjA9Qg=", + "hash": "sha256-SMIc78haJiH0XdTr9OBGWOcvXfYQW9thcNkCOxmNxDw=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.12.2", + "rev": "v1.12.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-on7kyb/AGdQK++5AOCEmkrRlbuW09u2653mda9gmvKE=" + "vendorHash": "sha256-B1trhV2/H5gP7EnUU7G45gIh95S2wYbANHsRM76CDWE=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index 78f9b11291fb8..334818d59f517 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-9eMcbmRCr92ebJsPTyDFnwGn3gsRpR7aAkzV6Qfntgo="; + hash = "sha256-glCZdaIsV8bim3iQuFKlIVmDm/YhDohVC6wIYvQuJAM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-ikgD17+lnKpxCzrIkOXOq332X48qEdSWXIIRoq76fB4="; + vendorHash = "sha256-tDaFceewyNW19HMmfdDC2qL12hUCw5TUa3TX5TXfvVo="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8da9a49f90a57..35ca72c5eee12 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { cat >test-runner <<EOF #!/bin/sh - ${python.pythonForBuild.interpreter} nix_run_setup test + ${python.pythonOnBuildForHost.interpreter} nix_run_setup test EOF chmod +x test-runner wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 47a3b35f02561..792d5c93a9e55 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.16"; + version = "3.9.18"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-p92wiQ01NBFs5910wngkNHnE/mOfs9XnOLUEOyk9VpA="; + hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index d06ff70fa2b6e..5343fd1c4daeb 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY="; }; - nativeBuildInputs = with python3.pythonForBuild.pkgs; [ + nativeBuildInputs = with python3.pythonOnBuildForHost.pkgs; [ setuptools setuptools-scm ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 613427ab0d97c..89664fc333f2d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-2GaBxY2o9qxpJbiPpl3PcPUPta4eEOp6rTteK4Xb95k="; + hash = "sha256-yyIs8TT6tNrqycgmYJVHdCQwUX5NlR2IHTW+Q+J9CIQ="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix index a014779970479..1cf7fed874e9d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; - configureFlags = [ "--without-dbus" ]; + configureFlags = [ + "--without-dbus" + "--enable-quality-check=no" + ]; + enableParallelBuilding = true; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 23afcc13e414d..9d639817c39f9 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20231106-1"; + version = "20231107-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-alQOYh1I4t1OppHbjsbDK6wc599Z0uDAyQjCtKM72ak="; + hash = "sha256-5JF/cU2yz1TDKUSAiZJ5LQfvsGSQtuww543O03gkZ+Y="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 3687379f8b4f8..c6191e8b47761 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -53,7 +53,6 @@ , libthai , libdatrie , xdg-utils -, xorg , libsysprof-capture , libpsl , brotli @@ -104,14 +103,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.11.3"; + version = "4.11.6"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Xjb8um3TA2yIPrCdEV1BJ10keyAqTnlU20ZZ0T3P3ls="; + hash = "sha256-GV5jaC1chm4cq097/aP18Z4QemTO4tt8SBrdxCQYaS8="; }; patches = [ @@ -217,7 +216,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 3d0ea6353d480..21a8a4a963030 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -4,6 +4,7 @@ , gtk3 , gtk4 , libnotify +, copyDesktopItems , makeDesktopItem , makeWrapper , mesa @@ -17,32 +18,21 @@ , xorg }: -let - version = "10.114.26-2"; - desktopItem = makeDesktopItem rec { - name = "Wavebox"; - exec = "wavebox"; - icon = "wavebox"; - desktopName = name; - genericName = name; - categories = [ "Network" "WebBrowser" ]; - }; - - tarball = "Wavebox_${version}.tar.gz"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wavebox"; - inherit version; + version = "10.118.5-2"; + src = fetchurl { - url = "https://download.wavebox.app/stable/linux/tar/${tarball}"; - sha256 = "1yk664zgahjg6n98n3kc9avcay0nqwcyq8wq231p7kvd79zazk0r"; + url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; + sha256 = "sha256-TxMl8pdycCMY6NFi5MSLZg0p/+KmuAPQOm370bPMm/0="; }; # don't remove runtime deps dontPatchELF = true; + # ignore optional Qt 6 shim + autoPatchelfIgnoreMissingDeps = [ "libQt6Widgets.so.6" "libQt6Gui.so.6" "libQt6Core.so.6" ]; - nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook copyDesktopItems ]; buildInputs = with xorg; [ libXdmcp @@ -62,14 +52,28 @@ stdenv.mkDerivation { runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ]; + desktopItems = [ + (makeDesktopItem rec { + name = "Wavebox"; + exec = "wavebox"; + icon = "wavebox"; + desktopName = name; + genericName = name; + categories = [ "Network" "WebBrowser" ]; + }) + ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/opt/wavebox cp -r * $out/opt/wavebox - # provide desktop item and icon - mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps - ln -s ${desktopItem}/share/applications/* $out/share/applications + # provide icon for desktop item + mkdir -p $out/share/icons/hicolor/128x128/apps ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png + + runHook postInstall ''; postFixup = '' @@ -77,6 +81,8 @@ stdenv.mkDerivation { --prefix PATH : ${xdg-utils}/bin ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Wavebox messaging application"; homepage = "https://wavebox.io"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/update.sh b/pkgs/applications/networking/instant-messengers/wavebox/update.sh new file mode 100755 index 0000000000000..316f8bfbb7ecc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wavebox/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update curl jq + +version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["tar"] | match("https://download.wavebox.app/stable/linux/tar/Wavebox_(.+).tar.gz").captures[0]["string"]') +nix-update wavebox --version "$version" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index cf6a9ccae5351..10af3d3ea4d3b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.16.2.23409"; - versions.x86_64-darwin = "5.16.2.23409"; - versions.x86_64-linux = "5.16.5.303"; + versions.aarch64-darwin = "5.16.6.24664"; + versions.x86_64-darwin = "5.16.6.24664"; + versions.x86_64-linux = "5.16.6.382"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-MUkxEj4G6MCCXcqyFquCrHhnu+sVw5H4HSk+sP5H+gY="; + hash = "sha256-5xccYYisVRZw7tJ6uri52BuaeURadaHypse4vjwPQIY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-niR/WbMq7T1PBCJMK1DdhbFc4eJDgub8LIv3X4i8S5c="; + hash = "sha256-N3jzvxoRY3W5fw1Fs0qevgHC+7cLLYvoGA/ZYiE71JA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-M+76HzqhPVxsP0nZOG4Oe8lnRJ9MJ2mE4+1hGvRkSUg="; + hash = "sha256-2O8jGQHGyF5XLQUxHUWA3h9K792lRQmOC2mS0rTukSw="; }; }; diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index b0e771a80f4e2..c21a444b61c1e 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://kirc.io/"; + homepage = "https://mcpcpc.github.io/kirc/"; description = "Tiny IRC client written in C99"; longDescription = '' kirc is a tiny open-source Internet Relay Chat (IRC) client designed with diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index 8c1a96d5234f5..eb443666764fd 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Advanced IRC Client"; - homepage = "http://www.kvirc.net/"; + homepage = "https://www.kvirc.net/"; license = licenses.gpl2; maintainers = [ maintainers.suhr ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 341f4628dc3b2..c5a07a89c35e2 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 7bc5e2f59679d..81a625e5210fd 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { broken = stdenv.isDarwin; description = "Client for many p2p networks, with multiple frontends"; - homepage = "http://mldonkey.sourceforge.net/"; + homepage = "https://github.com/ygrek/mldonkey"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index c8ac75683ae29..df91e40eab829 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { buildPhase = '' runHook preBuild - ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + ${python3Packages.python.pythonOnBuildForHost.interpreter} -O -m compileall . runHook postBuild ''; diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 07ea1707526d1..d0a358a5ba15b 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + ${python3Packages.python.pythonOnBuildForHost.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 97207d569f93b..e0249f813a74c 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.1"; - code = "XZ5iuiVZQsuexQaMmmLAS7FGWNh1TkXRWJR7"; + version = "1.14.2"; + code = "XZAwMrVZidapyDxpd2pCNlGy3BcjdbYCf1Yk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-6IHt9qxMuDe9f1T+t8JXfPXLUCVe865Od8/ixPR3gso="; + hash = "sha256-5dTo0/R+RA+C0PKzaCmcSy7YwzT3Qlwq1xMw6wPJt28="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 77d72060c1e22..19d19310591d5 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hmlzv1WaT+KucR7RGPC3bKcIdTxPOvK2s17nDucdu7c="; + sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I="; }; strictDeps = true; diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 3114a9b7c3eaa..91875c1b55841 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -47,7 +47,7 @@ in ''; homepage = "https://www.scuttlebutt.nz/"; license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ]; + maintainers = with maintainers; [ asymmetric picnoir cyplo ]; mainProgram = "ssb-patchwork"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index daa54ae05a3a5..042f623366db6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-HDzAqnWRfBlRHVf3V7+Y1IPH4QmZiRpxpEzOUgOYgUk="; + hash = "sha256-JsjZzOYBQ5DD7BsBq/lO2AZvC3Rx4mGr5cUJEU6ufNc="; }; - vendorHash = "sha256-I/ul8ocHPlvtgbTR+/1FyqF0IbHZZSoAFe/0RFJtOYk="; + vendorHash = "sha256-XYXIj+7xe33hCYM6Z9tqGSgr/P0LVlaPNf3T0PrxU7I="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/applications/networking/upnp-router-control/default.nix index 4e9bb7f82068e..d9ee62affa3b8 100644 --- a/pkgs/applications/networking/upnp-router-control/default.nix +++ b/pkgs/applications/networking/upnp-router-control/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "upnp-router-control"; - version = "0.3.3"; + version = "0.3.4"; src = fetchzip { url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; - hash = "sha256-d5NmA1tOQtYPjGXYfH0p9CCnWM+aVTX2KuV36QCDxd8="; + hash = "sha256-28F/OB2fHemn7HLVFEDmefRA5AsEaQKy+Qbcv75z9w0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index 37afa6cc226f2..efd20632a2a31 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clockify"; - version = "2.0.3"; + version = "2.1.6"; src = fetchurl { - url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb"; - sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8="; + url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; + hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify" $out/bin + --replace "/opt/Clockify/" "" makeWrapper ${electron}/bin/electron $out/bin/clockify \ --add-flags $out/opt/Clockify/resources/app.asar @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://clockify.me"; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "clockify"; platforms = [ "x86_64-linux" ]; - }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index eacda570cc0c1..7c378bc52a90d 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchFromGitHub , fetchurl , fetchpatch , aqbanking @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { # Upstream uploaded a -1 tarball on the same release, remove on next release - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2"; hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; }; @@ -97,12 +98,29 @@ stdenv.mkDerivation rec { enableParallelChecking = true; checkTarget = "check"; + passthru.docs = stdenv.mkDerivation { + pname = "gnucash-docs"; + inherit version; + + src = fetchFromGitHub { + owner = "Gnucash"; + repo = "gnucash-docs"; + rev = version; + hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 libxslt ]; + }; + preFixup = '' gappsWrapperArgs+=( + # documentation + --prefix XDG_DATA_DIRS : ${passthru.docs}/share # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # gsettings schema location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} ) ''; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 88091fa4b0359..105ec8456895a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome }: +, libsoup_3, gnome }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.6.6"; + version = "5.7.1"; src = fetchurl { url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ZW/N8YUU8r7SYY/+hqVYrqYW/KQqtuChfQJxXftl3A4="; + hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; - buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index d98958a8dfbab..c5c291511ebb2 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -224,13 +224,13 @@ python.pkgs.buildPythonApplication rec { postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works # for files in `python.sitePackages` - ${python.pythonForBuild.interpreter} -OO -m compileall src + ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src # Collect static files - ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input # Compile string translations using gettext - ${python.pythonForBuild.interpreter} src/manage.py compilemessages + ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages ''; installPhase = '' diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index e90184b522125..ff7ce41212988 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -46,6 +46,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 67fa25115fb01..8376b49b81976 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11704"; + version = "11.1.0.11708"; src = if useChineseVersion then fetchurl { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE="; + hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk="; } else fetchurl { url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI="; + hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4="; }; unpackCmd = "dpkg -x $src ."; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 506b934d77c98..32e42a8b944ff 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.27"; + version = "6.0.30"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-+nCPLVVBkEu0g2Kxt/XYAt6sYxYm05nPcmPNS2OejRs="; + hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -153,6 +153,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; - knownVulnerabilities = [ "CVE-2023-5217" ]; }; } diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 6c3fbc16c4055..329d87d80f4c0 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert ebooks to Morse MP3s/OGGs"; - homepage = "http://fkurz.net/ham/ebook2cw.html"; + homepage = "https://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 085706658afff..a207ba2f14681 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { openssl zlib lmdb - (curl.override { inherit openssl; }) + curl wxGTK32 ]; diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 00cc0eaca1292..23fb34db0e320 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -1,27 +1,22 @@ -{ lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, +{ lib, stdenv, fetchgit, asciidoc, asciidoctor, cmake, pkg-config, + fftw, fftwFloat, gfortran, hamlib_4, libtool, libusb1, qtbase, qtmultimedia, qtserialport, qttools, boost, texinfo, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "wsjtx"; version = "2.6.1"; - # This is a "superbuild" tarball containing both wsjtx and a hamlib fork - src = fetchurl { - url = "https://sourceforge.net/projects/wsjt/files/wsjtx-${version}/wsjtx-${version}.tgz"; - sha256 = "sha256-YNDiy0WkmmrVhbCQiCGp/yw6wlZNYQQmIP82wt3Mdl8="; + src = fetchgit { + url = "http://git.code.sf.net/p/wsjt/wsjtx"; + rev = "wsjtx-${version}"; + hash = "sha256-fELx3B9JqCCL5vaIHab3of5ah9qdu5lemqjUnvY5DdM="; }; - # Hamlib builds with autotools, wsjtx builds with cmake - # Omitting pkg-config because it causes issues locating the built hamlib nativeBuildInputs = [ - asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool - qttools texinfo wrapQtAppsHook + asciidoc asciidoctor cmake gfortran libtool + pkg-config qttools texinfo wrapQtAppsHook ]; - buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport boost ]; - - # Remove Git dependency from superbuild since sources are included - patches = [ ./super.patch ]; + buildInputs = [ fftw fftwFloat hamlib_4 libusb1 qtbase qtmultimedia qtserialport boost ]; meta = with lib; { description = "Weak-signal digital communication modes for amateur radio"; @@ -33,9 +28,8 @@ stdenv.mkDerivation rec { contacts under extreme weak-signal conditions. ''; homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html"; - # Older licenses are for the statically-linked hamlib - license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; + license = with licenses; [ gpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ lasandell numinit ]; + maintainers = with maintainers; [ lasandell numinit melling ]; }; } diff --git a/pkgs/applications/radio/wsjtx/super.patch b/pkgs/applications/radio/wsjtx/super.patch deleted file mode 100644 index 2d72fcddf0dcc..0000000000000 --- a/pkgs/applications/radio/wsjtx/super.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84fa38a..87e31bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ source tarball." ) - # - # Find_library (USB_LIBRARY NAMES libusb.a usb) - Find_program (PATCH_EXECUTABLE patch REQUIRED) --Find_package (Git REQUIRED) - - # - # extra C flags to minimize hamlib excutable sizes diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index d656c39d0bc06..3b61c8dac2b89 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -70,7 +70,9 @@ stdenv.mkDerivation rec { qtwayland ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = '' + export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major version}0101 +%s) + '' + lib.optionalString stdenv.isDarwin '' export LC_ALL=en_US.UTF-8 ''; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 92cb420139df7..76780298120ed 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedtools"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc="; + sha256 = "sha256-rrk+FSv1bGL0D1lrIOsQu2AT7cw2T4lkDiCnzil5fpg="; }; strictDeps = true; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 8ec08f22b7d1c..7cf1560d2492c 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1471"; + version = "1499"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-HQ2C7SFfJS6TOJZUm6szhu+hMm41BnH8A7DZE5yh9fM="; + hash = "sha256-uofXtGGDloM1FxW0PYKKwfDOPlAJiapGVKwd1clFzp8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index e5ee4b53089f6..f280f81fae842 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.pythonForBuild.interpreter} setup.py install \ + ${python.pythonOnBuildForHost.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 1d4a11bfb3f28..1685bb7aba33c 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchFromGitHub -, readline, cmake +{ lib +, stdenv +, fetchFromGitHub +, readline +, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abc-verifier"; - version = "unstable-2023-09-13"; + version = "unstable-2023-10-13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "daad9ede0137dc58487a0abc126253e671a85b14"; - hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ="; + rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43"; + hash = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - installPhase = "mkdir -p $out/bin && mv abc $out/bin"; + installPhase = '' + runHook preInstall + install -Dm755 'abc' "$out/bin/abc" + runHook postInstall + ''; # needed by yosys - passthru.rev = src.rev; + passthru.rev = finalAttrs.src.rev; meta = with lib; { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice Luflosi ]; mainProgram = "abc"; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 15c45466b1327..4f3f585c220cb 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.9.9"; src = fetchurl { - url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; + url = "https://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; - homepage = "http://fmv.jku.at/aiger/"; + homepage = "https://fmv.jku.at/aiger/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 9bfadc41f6099..a9b27877ab1e7 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shnarazk ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://fmv.jku.at/cadical"; + homepage = "https://fmv.jku.at/cadical/"; }; } diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index cfa8f62990c5e..0385909610e61 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; + url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { [ raskin ]; platforms = platforms.unix; license = licenses.free; - homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; + homepage = "https://cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { updateInfo = { - downloadPage = "http://www.cs.nyu.edu/acsys/cvc3/download.html"; + downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html"; }; }; } diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix index 2941952287bef..d1703340527b5 100644 --- a/pkgs/applications/science/logic/kissat/default.nix +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shnarazk ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://fmv.jku.at/kissat"; + homepage = "https://fmv.jku.at/kissat"; }; } diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 48def5fc2e4db..1fef05069a696 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "965"; src = fetchurl { - url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; + url = "https://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; - homepage = "http://fmv.jku.at/picosat/"; + homepage = "https://fmv.jku.at/picosat/"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ roconnor thoughtpolice ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 9fe39c8cef892..6165cfe8bd22a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -47,7 +47,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: configurePhase = concatStringsSep " " ( - [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 814f54f3863de..f4cc1f1fbfeaa 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "R"; - version = "4.3.1"; + version = "4.3.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jdC/JPECPG9hjDsxc4PSkbSklPQNc7mDrCL/6pnkupk="; + sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo="; }; outputs = [ "out" "tex" ]; diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 3cc9290a76267..d5ab38ff75149 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A package comprising of implementations of algorithms for vertex coloring and derivative computation"; - homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; + homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 2e79ca03635a2..fe9210641d2e7 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "polymake"; - version = "4.10"; + version = "4.11"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-YDiyZtbUC76ZVe3oRtzPRBfkEU+qh+d1ZWFhzUyi+Pg="; + sha256 = "sha256-XfbwrNcAEZvQxLV2Z2KFL/vYV3ZbXcyIgC/10hCK3SM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 4a8411cd34f98..2d830e3d10166 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; }) + # Backport Python 3.11 fix to v5 from v6.26 + # https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc + ./root5-python311-fix.patch ]; # https://github.com/root-project/root/issues/13216 diff --git a/pkgs/applications/science/misc/root/root5-python311-fix.patch b/pkgs/applications/science/misc/root/root5-python311-fix.patch new file mode 100644 index 0000000000000..3005b3a73f9b4 --- /dev/null +++ b/pkgs/applications/science/misc/root/root5-python311-fix.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/pyroot/src/MethodProxy.cxx b/bindings/pyroot/src/MethodProxy.cxx +--- a/bindings/pyroot/src/MethodProxy.cxx ++++ b/bindings/pyroot/src/MethodProxy.cxx +@@ -4,10 +4,10 @@ + // Bindings + #include "PyROOT.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 +-#include "code.h" // from Python +-#else ++#if PY_VERSION_HEX < 0x02050000 + #include "compile.h" // from Python ++#elif PY_VERSION_HEX < 0x030b0000 ++#include "code.h" // from Python + #endif + #ifndef CO_NOFREE + // python2.2 does not have CO_NOFREE defined diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 1eded1e419c4b..3acd66f790848 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.29.0"; + version = "7.32.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UfUzvDo5OE1LGCBBGoDpxG96RKOaShbqu5TOOILG3AY="; + hash = "sha256-9KuMPqvM8ZCTuomc0R9MBxsK3KIpukDTrlwU6MHysK0="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { pandas pytestCheckHook requests-mock + pillow ]; disabledTestPaths = [ @@ -56,6 +57,8 @@ python3.pkgs.buildPythonApplication rec { "tests/test_tes.py" "tests/test_tibanna.py" "tests/test_linting.py" + "tests/test_google_lifesciences.py" + "tests/test_conda_python_script/test_script.py" ]; disabledTests = [ diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index fdc8b6317a9dc..51815c26ae076 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE="; + hash = "sha256-vf0o0wBcG3878YD4mTUhni2aTUU9AJkG4an1oaRc4yw="; }; configureFlags = [ diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 0e7c6a27e29e4..c6a250d9123a6 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -58,6 +58,6 @@ mkDerivation rec { homepage = "https://github.com/Swordfish90/cool-retro-term"; license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4431784db2b33..230a08dd70f4b 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.21"; + version = "3.4.22"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw="; + hash = "sha256-bHHAA9H6oUS0cXkGEaY/A0TLWrshgno3UN5xJA6+8lU="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index f120b5290ec15..f7ab3c8acbf8b 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,6 +7,7 @@ , openssl , installShellFiles , dbus +, sudo , Libsystem , Cocoa , Kernel @@ -29,20 +30,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.30.1"; + version = "0.31.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0="; + hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc="; + vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU="; }).goModules; buildInputs = [ @@ -128,17 +129,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs - ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.pythonForBuild.interpreter} setup.py linux-package \ + ${python.pythonOnBuildForHost.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} - ${python.pythonForBuild.interpreter} setup.py build-launcher + ${python.pythonOnBuildForHost.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -150,6 +151,9 @@ buildPythonApplication rec { bashInteractive zsh fish + ] ++ lib.optionals (!stdenv.isDarwin) [ + # integration tests need sudo + sudo ]; # skip failing tests due to darwin sandbox diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 07813b849f716..4cd4c68673a72 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-vq/rrDOZUn/apHgk6YPnfG7hmKRSapuw49ZyFVMWNqs="; + hash = "sha256-E6KgFSlWa/MKG6R2P+K4T+P/JOqaIfxdWpsSFGHbihg="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index 5da7aab1b6f90..cf804ddfb54c6 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao="; + hash = "sha256-COgoj5MrX7VBwjgfH+Ud7gp0gE7gpsYoyd0Jv4uXoec="; }; - vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ="; + vendorHash = "sha256-btvFro0K0+9potwForIj/7h41l+LbUE0Gym9aHaWtEE="; subPackages = [ "." diff --git a/pkgs/applications/version-management/guilt/darwin-fix.patch b/pkgs/applications/version-management/guilt/darwin-fix.patch new file mode 100644 index 0000000000000..54c11059be64c --- /dev/null +++ b/pkgs/applications/version-management/guilt/darwin-fix.patch @@ -0,0 +1,20 @@ +uname -s is used to determine the differences between the command line +utilities like stat or awk in linux and darwin. However, in nix, guilt +will be using the nix versions of this programs, not the ones +installed in the system. Therefore, guilt should use the command-line +parameters that the linux forms of these commands expect, even if it +is being run on Darwin. + +diff --git a/guilt b/guilt +index bf50343..cfc9332 100755 +--- a/guilt ++++ b/guilt +@@ -986,7 +986,7 @@ guards_file="$GUILT_DIR/$branch/guards" + pager="more" + [ ! -z "$PAGER" ] && pager="$PAGER" + +-UNAME_S=`uname -s` ++UNAME_S="Linux" + + if [ -r "$GUILT_PATH/os.$UNAME_S" ]; then + . "$GUILT_PATH/os.$UNAME_S" diff --git a/pkgs/applications/version-management/guilt/default.nix b/pkgs/applications/version-management/guilt/default.nix new file mode 100644 index 0000000000000..664db771e93f2 --- /dev/null +++ b/pkgs/applications/version-management/guilt/default.nix @@ -0,0 +1,92 @@ +{ asciidoc +, docbook_xml_dtd_45 +, docbook_xsl +, fetchFromGitHub +, gawk +, git +, gnused +, lib +, makeWrapper +, openssl +, perl +, stdenv +, xmlto +}: + +stdenv.mkDerivation rec { + pname = "guilt"; + version = "0.37-rc1"; + + src = fetchFromGitHub { + owner = "jeffpc"; + repo = "guilt"; + rev = "v${version}"; + sha256 = "sha256-7OgRbMGYWtGvrZxKfJe0CkpmU3AUkPebF5NyTsfXeGA="; + }; + + doCheck = true; + + patches = [ + ./guilt-help-mandir.patch + ./darwin-fix.patch + ]; + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + perl + xmlto + ]; + buildInputs = [ + gawk + git + gnused + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + makeFlags = [ + "PREFIX=$(out)" + ]; + + postBuild = '' + make -j $NIX_BUILD_CORES doc + ''; + + preCheck = '' + patchShebangs regression/run-tests regression/*.sh + ''; + + postInstall = '' + make PREFIX=$out install-doc + ''; + + postFixup = '' + wrapProgram $out/bin/guilt --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + meta = with lib; { + description = "Manage patches like quilt, on top of a git repository"; + longDescription = '' + Andrew Morton originally developed a set of scripts for + maintaining kernel patches outside of any SCM tool. Others + extended these into a suite called quilt]. The basic idea behind + quilt is to maintain patches instead of maintaining source + files. Patches can be added, removed or reordered, and they can + be refreshed as you fix bugs or update to a new base + revision. quilt is very powerful, but it is not integrated with + the underlying SCM tools. This makes it difficult to visualize + your changes. + + Guilt allows one to use quilt functionality on top of a Git + repository. Changes are maintained as patches which are + committed into Git. Commits can be removed or reordered, and the + underlying patch can be refreshed based on changes made in the + working directory. The patch directory can also be placed under + revision control, so you can have a separate history of changes + made to your patches. + ''; + homepage = "https://github.com/jeffpc/guilt"; + maintainers = with lib.maintainers; [ javimerino ]; + license = [ licenses.gpl2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/guilt/guilt-help-mandir.patch b/pkgs/applications/version-management/guilt/guilt-help-mandir.patch new file mode 100644 index 0000000000000..54f1149f291e9 --- /dev/null +++ b/pkgs/applications/version-management/guilt/guilt-help-mandir.patch @@ -0,0 +1,15 @@ +nixpkgs' post-installation fixup moves the pages to share/man. Tell guilt-help so that it can find them. + +diff --git a/guilt-help b/guilt-help +index 93442a3..b29e059 100755 +--- a/guilt-help ++++ b/guilt-help +@@ -34,7 +34,7 @@ case $# in + ;; + esac + +-MANDIR=`dirname $0`/../man ++MANDIR=`dirname $0`/../share/man + MANDIR=`(cd "$MANDIR"; pwd)` + exec man -M "$MANDIR" "$page" + diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index a9929cca64e47..5acd1a6343447 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -30,6 +30,14 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch"; sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns"; }) + + # Merged upstream, fixes builds with newer rustc + (fetchpatch { + name = "josh-fix-builds-with-rust-173.patch"; + url = "https://github.com/josh-project/josh/commit/7b8259b81a9acabb528ddebc4ab30fc712f756fb.patch"; + sha256 = "sha256-YfrVlH6Ox05ZbmB/15HVaFlOyRTOFbYflq0edi6/X9k="; + includes = [ "josh-proxy/src/bin/josh-proxy.rs" ]; + }) ]; cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl"; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 224efe8c1ac23..fc8ec7b55d1fe 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { gnome.adwaita-icon-theme ]; - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ pygobject3 pycairo ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 0af4b1ceee29e..4831959d0fe0c 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -8,31 +8,32 @@ , pyyaml , markdown , ansi2html +, lxml , python , unzip }: let - version = "0.83.0"; + version = "0.86.10"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo="; + hash = "sha256-frwJgwJst2/NWd8VR0KbsVwm8JfWuekkY2oIIAdh3Fw="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; }); + vendorHash = "sha256-2khk7j22KON4MsuvFUNKSUpouJtVIOxE0hkh63iaxZ4="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.29"; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "${src.name}/worker"; pname = "buildsrht-worker"; - vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; + vendorHash = "sha256-obdaeRwMhuiCV2kVwDo1c+rU/hmsbiL1IgAf7AcIpoc="; }; in buildPythonPackage rec { @@ -50,7 +51,9 @@ buildPythonPackage rec { celery pyyaml markdown + # Unofficial dependencies ansi2html + lxml ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index e31bc13c82ae1..b413aa2c001d1 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,94 +1,78 @@ { lib , fetchFromSourcehut -, fetchNodeModules , buildPythonPackage -, pgpy , flask -, bleach -, misaka , humanize -, html5lib -, markdown +, sqlalchemy +, sqlalchemy-utils , psycopg2 -, pygments +, markdown +, mistletoe +, bleach , requests -, sqlalchemy -, cryptography , beautifulsoup4 -, sqlalchemy-utils +, pygments +, cryptography , prometheus-client -, celery , alembic +, redis +, celery +, html5lib , importlib-metadata -, mistletoe -, minio +, tinycss2 , sassc -, nodejs -, redis +, minify }: buildPythonPackage rec { pname = "srht"; - version = "0.69.0"; + version = "0.69.15"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "core.sr.ht"; rev = version; - sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc="; + sha256 = "sha256-T9yewweqnWL3IW5PHGyAcsIWCGn1ayK2rwrHVukYpgE="; fetchSubmodules = true; }; - node_modules = fetchNodeModules { - src = "${src}/srht"; - nodejs = nodejs; - sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8="; - }; - patches = [ - # Disable check for npm - ./disable-npm-install.patch # Fix Unix socket support in RedisQueueCollector patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; propagatedNativeBuildInputs = [ sassc - nodejs + minify ]; propagatedBuildInputs = [ - pgpy flask - bleach - misaka humanize - html5lib - markdown + sqlalchemy + sqlalchemy-utils psycopg2 - pygments - requests + markdown mistletoe - sqlalchemy - cryptography + bleach + requests beautifulsoup4 - sqlalchemy-utils + pygments + cryptography prometheus-client - - # Unofficial runtime dependencies? - celery alembic - importlib-metadata - minio redis + celery + # Used transitively through beautifulsoup4 + html5lib + # Used transitively trough bleach.css_sanitizer + tinycss2 + # Used by srht.debug + importlib-metadata ]; PKGVER = version; - preBuild = '' - cp -r ${node_modules} srht/node_modules - ''; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "srht" ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 9c9f6f4033301..37840f486dc5d 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -3,17 +3,16 @@ , recurseIntoAttrs , nixosTests , config +, fetchPypi }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 let - fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python3.override { packageOverrides = self: super: { - srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; + srht = self.callPackage ./core.nix { }; buildsrht = self.callPackage ./builds.nix { }; gitsrht = self.callPackage ./git.nix { }; @@ -26,6 +25,52 @@ let todosrht = self.callPackage ./todo.nix { }; scmsrht = self.callPackage ./scm.nix { }; + + # sourcehut is not (yet) compatible with SQLAlchemy 2.x + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.46"; + src = fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + nativeCheckInputs = with super; [ pytestCheckHook mock ]; + disabledTestPaths = []; + }); + + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "2.5.1"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; + }; + propagatedBuildInputs = with self; [ + flask + sqlalchemy + ]; + }); + + # sourcehut is not (yet) compatible with factory-boy 3.x + factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { + version = "2.12.0"; + src = fetchPypi { + pname = "factory_boy"; + inherit version; + hash = "sha256-+vSNYIoXNfDQo8nL9TbWT5EytUfa57pFLE2Zp56Eo3A="; + }; + nativeCheckInputs = (with super; [ + django + flask + mongoengine + pytestCheckHook + ]) ++ (with self; [ + sqlalchemy + flask-sqlalchemy + ]); + postPatch = ""; + }); }; }; in diff --git a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/pkgs/applications/version-management/sourcehut/disable-npm-install.patch deleted file mode 100644 index 3a8d1c82b3415..0000000000000 --- a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.py b/setup.py -index d63bac8..e1d0c35 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,9 +5,6 @@ import glob - import os - import sys - --if subprocess.call(["npm", "i"], cwd="srht") != 0: -- sys.exit(1) -- - ver = os.environ.get("PKGVER") or subprocess.run(['git', 'describe', '--tags'], - stdout=subprocess.PIPE).stdout.decode().strip() - diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix deleted file mode 100644 index bbc18d0442d62..0000000000000 --- a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, jq }: { src, nodejs, sha256 }: - -# Only npm >= 5.4.2 is deterministic, see: -# https://github.com/npm/npm/issues/17979#issuecomment-332701215 -assert lib.versionAtLeast nodejs.version "8.9.0"; - -stdenv.mkDerivation { - name = "node_modules"; - - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "recursive"; - - nativeBuildInputs = [ jq nodejs ]; - - buildCommand = '' - cp -r ${src}/* . - HOME=. npm install --force --ignore-scripts --only=production - for f in $(find node_modules -name package.json); do - # https://github.com/npm/npm/issues/10393 - jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp - mv $f.tmp $f - done - mv node_modules $out - ''; -} diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index 4327e395d5333..8737e4266f452 100644 --- a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -1,5 +1,5 @@ { unzip -, gqlgenVersion ? "0.17.2" +, gqlgenVersion ? "0.17.20" }: { overrideModAttrs = (_: { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index eae70b3724677..3a5163f9d1712 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -4,32 +4,38 @@ , buildPythonPackage , python , srht -, pygit2 , scmsrht +, pygit2 +, minio , unzip }: let - version = "0.78.20"; + version = "0.84.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ="; + sha256 = "sha256-sAkTsQlWtNDQ5vAhA2EeOvuJcj9A6AG8pgDyIKtr65s="; }; gitApi = buildGoModule ({ inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; + vendorHash = "sha256-LAYp0zgosZnFEbtxzjuTH9++0lbxhACr705HqXJz3D0="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); gitDispatch = buildGoModule { inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; + vendorHash = "sha256-EDvSZ3/g0xDSohrsAIpNhk+F0yy8tbnTW/3tURTonMc="; + + postPatch = '' + substituteInPlace gitsrht-dispatch/main.go \ + --replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch + ''; }; gitKeys = buildGoModule { @@ -37,6 +43,11 @@ let pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; + + postPatch = '' + substituteInPlace gitsrht-keys/main.go \ + --replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys + ''; }; gitShell = buildGoModule { @@ -44,6 +55,11 @@ let pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; + + postPatch = '' + substituteInPlace gitsrht-shell/main.go \ + --replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell + ''; }; gitUpdateHook = buildGoModule { @@ -51,6 +67,11 @@ let pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + + postPatch = '' + substituteInPlace gitsrht-update-hook/main.go \ + --replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook + ''; }; in @@ -65,8 +86,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht - pygit2 scmsrht + pygit2 + minio ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 205e4e7b1d1d1..f448109a6d7df 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -12,26 +12,29 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.31.3"; + version = "0.32.4"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hg.sr.ht"; rev = version; - sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0="; + sha256 = "mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60="; vc = "hg"; }; postPatch = '' substituteInPlace Makefile \ --replace "all: api hgsrht-keys" "" + + substituteInPlace hgsrht-shell \ + --replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell ''; hgsrht-api = buildGoModule ({ inherit src version; pname = "hgsrht-api"; modRoot = "api"; - vendorHash = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; + vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); hgsrht-keys = buildGoModule { @@ -39,12 +42,17 @@ buildPythonPackage rec { pname = "hgsrht-keys"; modRoot = "hgsrht-keys"; vendorHash = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; + + postPatch = '' + substituteInPlace hgsrht-keys/main.go \ + --replace /var/log/hgsrht-keys /var/log/sourcehut/hgsrht-keys + ''; }; propagatedBuildInputs = [ - srht python-hglib scmsrht + srht unidiff ]; diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index c3a9c509f8934..6f1b17b01c3e7 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,21 +1,35 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage +, python , srht , pyyaml +, unzip }: buildPythonPackage rec { pname = "hubsrht"; - version = "0.14.14"; + version = "0.17.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; + sha256 = "sha256-A+lvRsPz5EBnM0gB4PJuxSMpELZTrK14ORxDbTKPXWg="; }; + postPatch = '' + substituteInPlace Makefile --replace "all: api" "" + ''; + + hubsrht-api = buildGoModule ({ + inherit src version; + pname = "hubsrht-api"; + modRoot = "api"; + vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + propagatedBuildInputs = [ srht pyyaml @@ -23,9 +37,13 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + postInstall = '' + ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api ''; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "hubsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index b875a46fcafac..24b56b9dd3c15 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -3,31 +3,30 @@ , buildGoModule , buildPythonPackage , srht -, asyncpg , aiosmtpd +, asyncpg , pygit2 , emailthreads -, redis , python , unzip }: buildPythonPackage rec { pname = "listssrht"; - version = "0.51.11"; + version = "0.57.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY="; + sha256 = "sha256-nQZRSTAyTWxcPHrRVCZ5TgcrNgrlxBFc1vRds0cQwA0="; }; listssrht-api = buildGoModule ({ inherit src version; pname = "listssrht-api"; modRoot = "api"; - vendorHash = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; + vendorHash = "sha256-E5Zzft9ANJT/nhhCuenZpdo3t9QYLmA+AyDyrbGectE="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); postPatch = '' @@ -37,11 +36,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht - pygit2 - asyncpg aiosmtpd + asyncpg + pygit2 + # Unofficial dependency emailthreads - redis ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index dadc508edd869..b01d739a06009 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,22 +1,35 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , pygit2 , python +, unzip }: buildPythonPackage rec { pname = "mansrht"; - version = "0.15.26"; + version = "0.16.1"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; + sha256 = "sha256-94G9/Kzt1gaQ2CaXtsJYCB6W5OTdn27XhVdpNJ9a5cE="; }; + postPatch = '' + substituteInPlace Makefile --replace "all: api" "" + ''; + + mansrht-api = buildGoModule ({ + inherit src version; + pname = "mansrht-api"; + modRoot = "api"; + vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + propagatedBuildInputs = [ srht pygit2 @@ -27,6 +40,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${mansrht-api}/bin/api $out/bin/mansrht-api + ''; + pythonImportsCheck = [ "mansrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 205409bb4d945..28cab5852193c 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -2,38 +2,34 @@ , fetchFromSourcehut , buildPythonPackage , buildGoModule -, pgpy -, srht -, redis +, alembic , bcrypt +, dnspython , qrcode +, redis +, srht , stripe -, zxcvbn -, alembic -, pystache -, dnspython -, sshpubkeys -, weasyprint , prometheus-client +, zxcvbn , python , unzip }: let - version = "0.61.3"; + version = "0.64.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU="; + hash = "sha256-eiNvoy68PvjZ3iwdeNPjsXJjxAXb2PMF1/HvJquWa/U="; }; metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; modRoot = "api"; - vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }); + vendorHash = "sha256-D3stDSb99uXze49kKZgGrAq5Zmg6hkIzIpsQKlnKVtE="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); in buildPythonPackage rec { @@ -46,19 +42,15 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - pgpy - srht - redis + alembic bcrypt + dnspython qrcode + redis + srht stripe - zxcvbn - alembic - pystache - sshpubkeys - weasyprint prometheus-client - dnspython + zxcvbn ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index abcef1648fc44..ca608438687ba 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -6,13 +6,13 @@ buildGoModule (rec { pname = "pagessrht"; - version = "0.7.4"; + version = "0.13.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY="; + sha256 = "sha256-vUN6c6cyhcLI8bKrFYKoxlBQ29VS/bowpSfBRmi47wg="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule (rec { --replace "all: server" "" ''; - vendorHash = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; + vendorHash = "sha256-GKuHkUqSVBLN3k8YsFtxdmdHFkqKo9YZqDk2GBmbfWo="; postInstall = '' mkdir -p $out/share/sql/ @@ -35,4 +35,4 @@ buildGoModule (rec { }; # There is no ./loaders but this does not cause troubles # to go generate -} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; }) +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; }) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 253ea8c0b9d67..d62ee38fc2335 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.13.8"; + version = "0.15.1"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis="; + sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM="; }; postPatch = '' diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 1edc951cbed8b..810f3007c2537 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -2,25 +2,23 @@ , fetchFromSourcehut , buildPythonPackage , srht -, redis , pyyaml , buildsrht }: buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.22"; + version = "0.22.23"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; + sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; }; propagatedBuildInputs = [ srht - redis pyyaml buildsrht ]; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 6b00d3793d93b..0a5cefc130d5c 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -3,9 +3,7 @@ , buildGoModule , buildPythonPackage , srht -, redis , alembic -, pystache , pytest , factory-boy , python @@ -14,13 +12,13 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.72.2"; + version = "0.74.6"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8="; + sha256 = "sha256-j12pCGfKf6+9R8NOBIrH2V4OuSMuncU6S1AMWFVoHts="; }; postPatch = '' @@ -32,14 +30,12 @@ buildPythonPackage rec { inherit src version; pname = "todosrht-api"; modRoot = "api"; - vendorHash = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; + vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); propagatedBuildInputs = [ srht - redis alembic - pystache ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index 54727e0317cb9..e9efc0816eb13 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -7,16 +7,26 @@ root=../../../.. tmp=$(mktemp -d) trap 'rm -rf "$tmp"' EXIT +attr_path() { + case "$1" in + pagessrht) printf "sourcehut.$1";; + *) printf "sourcehut.python.pkgs.$1";; + esac +} + default() { - (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') + local p="$(attr_path "$1")" + (cd "$root" && nix-instantiate --eval --strict -A $p.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/') } version() { - (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.version" | tr -d '"') + local p="$(attr_path "$1")" + (cd "$root" && nix-instantiate --eval --strict -A $p.version | tr -d '"') } src_url() { - nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"' + local p="$(attr_path "$1")" + nix-instantiate --eval --strict --expr " with import $root {}; let src = $p.drvAttrs.src; in src.meta.homepage" | tr -d '"' } get_latest_version() { @@ -35,8 +45,9 @@ update_version() { default_nix="$(default "$1")" oldVersion="$(version "$1")" version="$(get_latest_version "$1")" + local p="$(attr_path "$1")" - (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") + (cd "$root" && update-source-version "$p" "$version") # Update vendorHash of Go modules retry=true diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 6f03b139cf1b0..ecb5093f4be17 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -114,6 +114,7 @@ let description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; homepage = "https://subversion.apache.org/"; + mainProgram = "svn"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index b3c7fd7c8d0b4..61f59854debd5 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-FTfkVD2uBfCBbP7fjjfG21bOGDVd2j6bhPLHGPm3xh4="; + hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8290e39979c39..33fb4fc782178 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -19,6 +19,7 @@ , libuchardet , libiconv , xcbuild +, sigtool , waylandSupport ? stdenv.isLinux , wayland @@ -154,7 +155,7 @@ in stdenv'.mkDerivation (finalAttrs: { pkg-config python3 ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -203,6 +204,11 @@ in stdenv'.mkDerivation (finalAttrs: { postBuild = lib.optionalString stdenv.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + # Swap binary and bundle symlink to sign bundle executable as symlinks cannot be signed + rm build/mpv.app/Contents/MacOS/mpv-bundle + mv build/mpv.app/Contents/MacOS/mpv build/mpv.app/Contents/MacOS/mpv-bundle + ln -s mpv-bundle build/mpv.app/Contents/MacOS/mpv + codesign --force --sign - build/mpv.app/Contents/MacOS/mpv-bundle popd ''; @@ -250,6 +256,7 @@ in stdenv'.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; + mainProgram = "mpv"; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/video/mpv/scripts/acompressor.nix b/pkgs/applications/video/mpv/scripts/acompressor.nix index d10ef5f9df755..d82d12f163e7f 100644 --- a/pkgs/applications/video/mpv/scripts/acompressor.nix +++ b/pkgs/applications/video/mpv/scripts/acompressor.nix @@ -1,27 +1,17 @@ -{ stdenvNoCC +{ lib +, buildLua , mpv-unwrapped -, lib }: -stdenvNoCC.mkDerivation rec { +buildLua { + inherit (mpv-unwrapped) src version; pname = "mpv-acompressor"; - version = mpv-unwrapped.version; - - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/acompressor.lua"; - - dontBuild = true; - dontUnpack = true; - - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/acompressor.lua - ''; - - passthru.scriptName = "acompressor.lua"; + scriptPath = "TOOLS/lua/acompressor.lua"; meta = with lib; { + inherit (mpv-unwrapped.meta) license; description = "Script to toggle and control ffmpeg's dynamic range compression filter."; homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua"; - license = licenses.gpl2Plus; maintainers = with maintainers; [ nicoo ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix new file mode 100644 index 0000000000000..b86642305fc60 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -0,0 +1,22 @@ +{ lib +, stdenvNoCC }: + +let fileName = pathStr: lib.last (lib.splitString "/" pathStr); +in +lib.makeOverridable ( + { pname, scriptPath ? "${pname}.lua", ... }@args: + stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { + dontBuild = true; + preferLocalBuild = true; + + outputHashMode = "recursive"; + installPhase = '' + runHook preInstall + install -m644 -Dt $out/share/mpv/scripts ${scriptPath} + runHook postInstall + ''; + + passthru.scriptName = fileName scriptPath; + meta.platforms = lib.platforms.all; + } args) +) diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index c147da8d45984..bffc27bd1eacc 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -1,11 +1,9 @@ { lib , fetchFromGitHub -, nix-update-script -, stdenvNoCC }: +, buildLua }: -stdenvNoCC.mkDerivation { +buildLua { pname = "chapterskip"; - passthru.scriptName = "chapterskip.lua"; version = "unstable-2022-09-08"; src = fetchFromGitHub { @@ -15,17 +13,8 @@ stdenvNoCC.mkDerivation { hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; }; - dontBuild = true; - preferLocalBuild = true; - installPhase = "install -Dt $out/share/mpv/scripts chapterskip.lua"; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = with lib; { + meta = { homepage = "https://github.com/po5/chapterskip"; - platforms = platforms.all; - maintainers = with maintainers; [ nicoo ]; + maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 40a1050cd324a..4f90b0c62ed05 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, fetchgit, lib +{ lib, fetchgit, buildLua , yad, mkvtoolnix-cli, libnotify }: -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { @@ -22,15 +22,9 @@ stdenvNoCC.mkDerivation { 'yad_exe = "${yad}/bin/yad"' \ --replace 'notify_send_exe = "notify-send"' \ 'notify_send_exe = "${libnotify}/bin/notify-send"' \ - ''; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp convert_script.lua $out/share/mpv/scripts - ''; - passthru.scriptName = "convert_script.lua"; + scriptPath = "convert_script.lua"; meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 2866f80f5652e..cdc641043f374 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -3,31 +3,32 @@ , config }: -lib.recurseIntoAttrs +let buildLua = callPackage ./buildLua.nix { }; +in lib.recurseIntoAttrs ({ - acompressor = callPackage ./acompressor.nix { }; + acompressor = callPackage ./acompressor.nix { inherit buildLua; }; autocrop = callPackage ./autocrop.nix { }; autodeint = callPackage ./autodeint.nix { }; autoload = callPackage ./autoload.nix { }; - chapterskip = callPackage ./chapterskip.nix { }; - convert = callPackage ./convert.nix { }; + chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; + convert = callPackage ./convert.nix { inherit buildLua; }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; - quality-menu = callPackage ./quality-menu.nix { }; + quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; thumbfast = callPackage ./thumbfast.nix { }; - thumbnail = callPackage ./thumbnail.nix { }; + thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; uosc = callPackage ./uosc.nix { }; visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; cutter = callPackage ./cutter.nix { }; } - // (callPackage ./occivink.nix { })) + // (callPackage ./occivink.nix { inherit buildLua; })) // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 } diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 720fdaae5b3fa..8ec05a3cf6915 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,6 +1,6 @@ -{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }: +{ lib, buildLua, fetchFromGitHub, yt-dlp }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-playlistmanager"; version = "unstable-2023-08-09"; @@ -17,21 +17,12 @@ stdenvNoCC.mkDerivation rec { 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', ''; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D -t $out/share/mpv/scripts playlistmanager.lua - runHook postInstall - ''; - - passthru.scriptName = "playlistmanager.lua"; + scriptPath = "playlistmanager.lua"; meta = with lib; { description = "Mpv lua script to create and manage playlists"; homepage = "https://github.com/jonniek/mpv-playlistmanager"; license = licenses.unlicense; - platforms = platforms.all; maintainers = with maintainers; [ lunik1 ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index da723fd9102e6..167e2fef6ac09 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -1,14 +1,17 @@ { lib -, stdenvNoCC , fetchFromGitHub +, buildLua }: let - script = { n, ... }@p: - stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { - pname = "mpv_${n}"; - passthru.scriptName = "${n}.lua"; - + camelToKebab = let + inherit (lib.strings) match stringAsChars toLower; + isUpper = match "[A-Z]"; + in stringAsChars (c: if isUpper c != null then "-${toLower c}" else c); + + mkScript = name: args: + buildLua (lib.attrsets.recursiveUpdate rec { + pname = camelToKebab name; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; @@ -17,37 +20,26 @@ let }; version = "unstable-2022-10-02"; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp -r scripts/${n}.lua $out/share/mpv/scripts/ - ''; + scriptPath = "scripts/${pname}.lua"; meta = with lib; { homepage = "https://github.com/occivink/mpv-scripts"; license = licenses.unlicense; - platforms = platforms.all; maintainers = with maintainers; [ nicoo ]; }; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - } p); + } args); in -{ +lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` - seekTo = script { - n = "seek-to"; + seekTo = { meta.description = "Mpv script for seeking to a specific position"; outputHash = "sha256-3RlbtUivmeoR9TZ6rABiZSd5jd2lFv/8p/4irHMLshs="; }; - blacklistExtensions = script { - n = "blacklist-extensions"; + blacklistExtensions = { meta.description = "Automatically remove playlist entries based on their extension."; outputHash = "sha256-qw9lz8ofmvvh23F9aWLxiU4YofY+YflRETu+nxMhvVE="; }; - } diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 45d358843b377..d0eb2ca0119ba 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -1,33 +1,22 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , oscSupport ? false }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-quality-menu"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc="; + hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp quality-menu.lua $out/share/mpv/scripts - '' + lib.optionalString oscSupport '' - cp quality-menu-osc.lua $out/share/mpv/scripts - '' + '' - runHook postInstall - ''; - passthru.scriptName = "quality-menu.lua"; + scriptPath = if oscSupport then "*.lua" else passthru.scriptName; meta = with lib; { description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index fb231d87ca325..88209f049f6bc 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { postPatch = '' substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"' + --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' ''; dontBuild = true; diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index 291db71dc75f3..29509bd033f3f 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,6 +1,6 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3 }: +{ lib, buildLua, fetchFromGitHub, python3 }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-thumbnail-script"; version = "0.5.3"; @@ -12,19 +12,10 @@ stdenvNoCC.mkDerivation rec { }; nativeBuildInputs = [ python3 ]; + postPatch = "patchShebangs concat_files.py"; + dontBuild = false; - postPatch = '' - patchShebangs concat_files.py - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts - runHook postInstall - ''; - - passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua"; + scriptPath = "mpv_thumbnail_script_{client_osc,server}.lua"; meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index b427318121ef0..a86c9671a4813 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -97,7 +97,7 @@ let '' + lib.optionalString stdenv.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" - makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} + makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv-bundle" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; meta = { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index ecfe1376eea38..f418e997333d1 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-sDgYHa6zwUsGAinWptFeeaTG5n9t7SCLYgjDurdMT6g="; + hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 13f8f40ed6358..8f2358fdd6abb 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -102,11 +102,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.18"; + version = "3.0.20"; src = fetchurl { url = "http://get.videolan.org/vlc/${finalAttrs.version}/vlc-${finalAttrs.version}.tar.xz"; - hash = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew="; + hash = "sha256-rccoW00nIc3fQOtScMraKqoQozTLVG/VWgY1NEe6KbU="; }; nativeBuildInputs = [ @@ -220,12 +220,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; }) - # patch to build with recent libplacebo - # https://code.videolan.org/videolan/vlc/-/merge_requests/3027 - (fetchpatch { - url = "https://code.videolan.org/videolan/vlc/-/commit/65ea8d19d91ac1599a29e8411485a72fe89c45e2.patch"; - hash = "sha256-Zz+g75V6X9OZI3sn614K9Uenxl3WtRHKSdLkWP3b17w="; - }) ]; postPatch = '' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 59cc830844c94..23d6f35cabf43 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner +{ lib, rustPlatform, fetchgit, fetchpatch +, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: @@ -13,6 +14,16 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "test-page-size-fix.patch"; + url = "https://chromium.googlesource.com/crosvm/crosvm/+/d9bc6e99ff5ac31d7d88b684c938af01a0872fc1%5E%21/?format=TEXT"; + decode = "base64 -d"; + includes = [ "src/crosvm/config.rs" ]; + hash = "sha256-3gfNzp0WhtNr+8CWSISCJau208EMIo3RJhM+4SyeV3o="; + }) + ]; + separateDebugInfo = true; cargoHash = "sha256-yRujLgPaoKx/wkG3yMwQ5ndy9X5xDWSKtCr8DypXvEA="; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 58221279e3364..0dc91af767f56 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,39 +4,43 @@ , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet -, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows -, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl -, seccompSupport ? stdenv.isLinux, libseccomp -, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner -, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio -, pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner, pipewire -, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image -, jackSupport ? !stdenv.isDarwin && !nixosTestRunner, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook -, vncSupport ? !nixosTestRunner, libjpeg, libpng -, smartcardSupport ? !nixosTestRunner, libcacard -, spiceSupport ? true && !nixosTestRunner, spice, spice-protocol -, ncursesSupport ? !nixosTestRunner, ncurses +, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !toolsOnly +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32 && !toolsOnly, numactl +, seccompSupport ? stdenv.isLinux && !toolsOnly, libseccomp +, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner && !toolsOnly +, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libpulseaudio +, pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, pipewire +, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, SDL2, SDL2_image +, jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libjack2 +, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook +, vncSupport ? !nixosTestRunner && !toolsOnly, libjpeg, libpng +, smartcardSupport ? !nixosTestRunner && !toolsOnly, libcacard +, spiceSupport ? true && !nixosTestRunner && !toolsOnly, spice, spice-protocol +, ncursesSupport ? !nixosTestRunner && !toolsOnly, ncurses , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid , openGLSupport ? sdlSupport, mesa, libepoxy, libdrm , virglSupport ? openGLSupport, virglrenderer -, libiscsiSupport ? true, libiscsi +, libiscsiSupport ? !toolsOnly, libiscsi , smbdSupport ? false, samba -, tpmSupport ? true +, tpmSupport ? !toolsOnly , uringSupport ? stdenv.isLinux, liburing , canokeySupport ? false, canokey-qemu -, capstoneSupport ? true, capstone +, capstoneSupport ? !toolsOnly, capstone , enableDocs ? true , hostCpuOnly ? false -, hostCpuTargets ? (if hostCpuOnly +, hostCpuTargets ? (if toolsOnly + then [ ] + else if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false +, toolsOnly ? false , gitUpdater +, qemu-utils # for tests attribute }: let @@ -47,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" - + lib.optionalString nixosTestRunner "-for-vm-tests"; + + lib.optionalString nixosTestRunner "-for-vm-tests" + + lib.optionalString toolsOnly "-utils"; version = "8.1.2"; src = fetchurl { @@ -239,14 +244,15 @@ stdenv.mkDerivation (finalAttrs: { ''; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - postInstall = '' + postInstall = lib.optionalString (!toolsOnly) '' ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; passthru = { qemu-system-i386 = "bin/qemu-system-i386"; - tests = { + tests = lib.optionalAttrs (!toolsOnly) { qemu-tests = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + qemu-utils-builds = qemu-utils; }; updateScript = gitUpdater { # No nicer place to find latest release. @@ -260,11 +266,14 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { - homepage = "http://www.qemu.org/"; + homepage = "https://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; + } + # toolsOnly: Does not have qemu-kvm and there's no main support tool + // lib.optionalAttrs (!toolsOnly) { + mainProgram = "qemu-kvm"; }; }) diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix deleted file mode 100644 index c284934b3f1d3..0000000000000 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, installShellFiles, qemu_kvm, removeReferencesTo }: - -stdenv.mkDerivation rec { - pname = "qemu-utils"; - inherit (qemu_kvm) version; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ qemu_kvm ]; - disallowedRequisites = [ qemu_kvm ]; - unpackPhase = "true"; - - installPhase = '' - mkdir -p "$out/bin" - cp "${qemu_kvm}/bin/qemu-img" "$out/bin/qemu-img" - cp "${qemu_kvm}/bin/qemu-io" "$out/bin/qemu-io" - cp "${qemu_kvm}/bin/qemu-nbd" "$out/bin/qemu-nbd" - ${removeReferencesTo}/bin/remove-references-to -t ${qemu_kvm} $out/bin/* - - installManPage ${qemu_kvm}/share/man/man1/qemu-img.1.gz - installManPage ${qemu_kvm}/share/man/man8/qemu-nbd.8.gz - ''; - - inherit (qemu_kvm) meta; -} diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 163812bdccf03..4e4d7e7d0a92e 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -83,7 +83,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://virt-manager.org"; + homepage = "https://virt-manager.org"; description = "Desktop user interface for managing virtual machines"; longDescription = '' The virt-manager application is a desktop user interface for managing diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 0e24dd9b08f2e..58d9edb269a46 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { }; passthru = { updateInfo = { - downloadPage = "http://virt-manager.org/download.html"; + downloadPage = "https://virt-manager.org/download.html"; }; }; } diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix index 6767f96384627..dcb454b3f82c3 100644 --- a/pkgs/applications/window-managers/cosmic/settings/default.nix +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , rust , rustPlatform -, cargo , cmake +, makeWrapper +, cosmic-icons , just , pkg-config , libxkbcommon @@ -19,13 +20,13 @@ , util-linuxMinimal }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cosmic-settings"; version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "pop-os"; - repo = "cosmic-settings"; + repo = pname; rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; }; @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal ]; + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; dontUseJustBuild = true; @@ -64,6 +65,11 @@ rustPlatform.buildRustPackage { "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" ]; + postInstall = '' + wrapProgram "$out/bin/cosmic-settings" \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 47ec249ea11ee..09577f37b2d63 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -40,13 +40,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-8n67P8wvtFgjOufTj4y1sRpBcbMrlhSlH7d8dOhUKns="; + hash = "sha256-HrnlCdZBqqE37gFORapfSGEGcqhCyhX2aSMRnDEmR0k="; }; patches = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index c102b6dfb416f..484cda3328d22 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc"; - hash = "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM="; + rev = "47bf87ade2bd32395615a385ebde1fefbcdf79a2"; + hash = "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY="; }; pname = diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 9960824e642ed..4657ab2464c77 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU="; + hash = "sha256-IKcRTKzlcDsbD5xydRNc9s4c4KjcQHaZgOc5kWPOAtU="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 63adf2a276516..893383a759aec 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -47,6 +47,7 @@ let "lagda.org" "lagda.rst" "lagda.tex" + "lagda.typ" ]; defaults = diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix index 80a0974192bb3..e6e391b2ceddf 100644 --- a/pkgs/build-support/agda/lib.nix +++ b/pkgs/build-support/agda/lib.nix @@ -6,7 +6,7 @@ * interfaceFile "Everything.agda" == "Everything.agdai" * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" */ - interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; + interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai"; /* Takes an arbitrary derivation and says whether it is an agda library package * that is not marked as broken. diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 1d06ce44a91ea..66bb3b7c09ffc 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -90,6 +90,7 @@ stdenvNoCC.mkDerivation { ${netrcPhase} # required that git uses the netrc file mv {,.}netrc + export NETRC=$PWD/.netrc export HOME=$PWD ''; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8f8104863e67d..ae3d28cc23194 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -207,6 +207,9 @@ checkout_ref(){ # Update submodules init_submodules(){ + # shallow with leaveDotGit will change hashes + [[ -z "$deepClone" ]] && [[ -z "$leaveDotGit" ]] && \ + clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} --progress --depth 1 || \ clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} --progress } @@ -422,8 +425,8 @@ fi tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) +ln -s "${NETRC:-$HOME/.netrc}" "$tmpHomePath/.netrc" HOME="$tmpHomePath" -ln -s "$NIX_BUILD_TOP/.netrc" "$HOME/" unset XDG_CONFIG_HOME export GIT_CONFIG_NOSYSTEM=1 diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index a18be65327b5d..23e5fa299010d 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -1,15 +1,13 @@ -{ testers, fetchgit, ... }: - -{ +{ testers, fetchgit, ... }: { simple = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "simple-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; }; sparseCheckout = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "sparse-checkout-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sparseCheckout = [ @@ -20,7 +18,7 @@ }; sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "sparse-checkout-non-cone-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sparseCheckout = [ @@ -30,4 +28,48 @@ nonConeMode = true; sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4="; }; + + leave-git = testers.invalidateFetcherByDrvHash fetchgit { + name = "leave-git-nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko="; + leaveDotGit = true; + }; + + submodule-simple = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-simple-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-rmP8PQT0wJBopdtr/hsB7Y/L1G+ZPdHC2r9LB05Qrj4="; + fetchSubmodules = true; + }; + + submodule-leave-git = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-leave-git-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk="; + leaveDotGit = true; + fetchSubmodules = true; + }; + + submodule-deep = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-deep-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + deepClone = true; + fetchSubmodules = true; + }; + + submodule-leave-git-deep = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-leave-git-deep-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + deepClone = true; + leaveDotGit = true; + fetchSubmodules = true; + }; } diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 7cfc0e9f9c0a5..9babc7ae62871 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs }: +{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs: { name ? "${args.pname}-${args.version}" , src ? null @@ -34,6 +34,7 @@ , npmPruneFlags ? npmInstallFlags # Value for npm `--workspace` flag and directory in which the files to be installed are found. , npmWorkspace ? null +, nodejs ? topLevelArgs.nodejs , ... } @ args: diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 4816ac1bdc734..7a0efbdab6234 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -131,6 +131,11 @@ buildGoModule rec { runHook postInstall ''; + checkFlags = [ + # Skip time dependent/flaky test + "-skip=TestSendStreamDataMessageWithStreamDataSequenceNumberMutexLocked" + ]; + postFixup = '' wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin ''; diff --git a/pkgs/by-name/co/cosmic-greeter/Cargo.lock b/pkgs/by-name/co/cosmic-greeter/Cargo.lock new file mode 100644 index 0000000000000..3aa66b780b44e --- /dev/null +++ b/pkgs/by-name/co/cosmic-greeter/Cargo.lock @@ -0,0 +1,4877 @@ +# 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.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +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 = "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 = "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 0.1.2", + "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 2.5.3", + "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 2.5.3", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "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 2.8.0", + "rustix 0.37.26", + "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 2.5.3", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[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.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.20", + "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 = "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 = "bindgen" +version = "0.69.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "042e2e131c066e496ea7880ef6cfeec415a9adc79fc882a65979394f8840bf7c" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.38", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[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.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.2.0", + "rustix 0.38.20", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.20", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[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.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", +] + +[[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 = "colorgrad" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" +dependencies = [ + "csscolorparser", +] + +[[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-bg-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-bg#6a6fe4e387e46c2e159df56a9768220a6269ccf4" +dependencies = [ + "colorgrad", + "cosmic-config", + "derive_setters", + "image", + "ron", + "serde", + "tracing", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "atomicwrites", + "calloop", + "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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-greeter" +version = "0.1.0" +dependencies = [ + "chrono", + "cosmic-bg-config", + "cosmic-config", + "env_logger", + "freedesktop_entry_parser", + "greetd_ipc", + "libcosmic", + "log", + "pam-client", + "pwd", + "shlex", + "tokio", + "wayland-client 0.31.1", +] + +[[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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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 = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[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.38", +] + +[[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.38", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[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_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.38", +] + +[[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 = "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 = "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 = "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.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.38", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[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 = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[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 = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +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 = "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.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 = "freedesktop_entry_parser" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4" +dependencies = [ + "nom", + "thiserror", +] + +[[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.38", +] + +[[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", + "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 = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[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.1", + "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.1", +] + +[[package]] +name = "greetd_ipc" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839390036de887ed0e6a58a82fc03619b27c96f24ac6425f7c9a6c397a6482f6" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[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 = "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 = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.17.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "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#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.17.0", + "thiserror", + "unicode-segmentation", +] + +[[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.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 = "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 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", + "rustix 0.38.20", + "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 = "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 = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[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.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "apply", + "ashpd", + "cosmic-config", + "cosmic-theme", + "css-color", + "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", + "slotmap", + "smithay-client-toolkit 0.17.0", + "taffy", + "thiserror", + "tokio", + "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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[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 = "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.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 = "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", + "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.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.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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 = "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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[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-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.38", +] + +[[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.38", +] + +[[package]] +name = "pam-client" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd776116a7ada5ebbe31f54cdc5b1030ed7265686cf7c8a21c057a2f8dab9a" +dependencies = [ + "bitflags 1.3.2", + "enum-repr", + "libc", + "pam-sys", + "rpassword", + "rustversion", +] + +[[package]] +name = "pam-sys" +version = "1.0.0-alpha5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9484729b3e52c0bacdc5191cb6a6a5f31ef4c09c5e4ab1209d3340ad9e997b" +dependencies = [ + "bindgen", + "libc", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.9", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[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.38", +] + +[[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.38", +] + +[[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 = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[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 = "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.20", + "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", +] + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "pwd" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" +dependencies = [ + "libc", + "thiserror", +] + +[[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_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "regex-syntax", +] + +[[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 = "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.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rpassword" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +dependencies = [ + "libc", + "serde", + "serde_json", + "winapi", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "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.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 = "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 = "serde" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[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.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-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +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=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "dlib", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[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.1", + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +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.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", +] + +[[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 = "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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +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#23ff477566b0239f04d3b89a2b3a4da2495e9577" +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.20", + "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.38", +] + +[[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 = "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 = "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.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.4", + "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.38", +] + +[[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.2", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[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 = "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-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", + "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 = "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[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.38", + "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.38", + "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.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-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[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.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "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 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", +] + +[[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.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", +] + +[[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-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", + "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.1", + "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.1", + "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.1", + "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-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.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.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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +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.4", + "winapi", +] + +[[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 = "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.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 = "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 2.5.3", + "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 = "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", +] + +[[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/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix new file mode 100644 index 0000000000000..754c181d9ff02 --- /dev/null +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, cmake +, just +, pkg-config +, libxkbcommon +, linux-pam +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-greeter"; + version = "unstable-2023-11-08"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "a497ed8b1e67aaa9eb878d4ba225b40a71e1706c"; + sha256 = "sha256-P37i0JYP21gGE7NIq9G3WVUa0vv2MdFJmo/GuRDuV8A="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; + "cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA="; + "cosmic-config-0.1.0" = "sha256-c2pGujYQ3WbbiHGhPo2kG8/NiydmpfFNQrlrb1nk/RY="; + "smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-8gctP/nRiYxTSDrLyXi/oQbA7bE41ywgMbyotY1N8Zk="; + }; + }; + + nativeBuildInputs = [ rustPlatform.bindgenHook cmake just pkg-config ]; + buildInputs = [ libxkbcommon wayland linux-pam ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-greeter"; + description = "Greeter for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/cr/cryptor/package.nix b/pkgs/by-name/cr/cryptor/package.nix new file mode 100644 index 0000000000000..5c11cab2f6796 --- /dev/null +++ b/pkgs/by-name/cr/cryptor/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeBinaryWrapper +, meson +, ninja +, pkg-config +, vala +, wrapGAppsHook +, gocryptfs +, gtk3 +, json-glib +, libgee +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cryptor"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "moson-mo"; + repo = "cryptor"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bgOOueOKSc6dLyxGU+ds9XYWM5mO+qCKC4dkCu2B1sQ="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + json-glib + libgee + ]; + + postInstall = '' + wrapProgram $out/bin/cryptor \ + --prefix PATH : "${lib.makeBinPath [ gocryptfs ]}" + ''; + + meta = { + description = "Simple gocryptfs GUI"; + homepage = "https://github.com/moson-mo/cryptor"; + license = lib.licenses.bsd3; + mainProgram = "cryptor"; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/dt/dtcmp/package.nix b/pkgs/by-name/dt/dtcmp/package.nix new file mode 100644 index 0000000000000..cd8f54e25d313 --- /dev/null +++ b/pkgs/by-name/dt/dtcmp/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mpi, lwgrp }: + +stdenv.mkDerivation rec { + pname = "dtcmp"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "dtcmp"; + rev = "v${version}"; + hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ lwgrp ]; + + configureFlags = [ "--with-lwgrp=${lib.getDev lwgrp}" ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "MPI datatype comparison library"; + homepage = "https://github.com/LLNL/dtcmp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/by-name/dv/dvb-apps/package.nix b/pkgs/by-name/dv/dvb-apps/package.nix new file mode 100644 index 0000000000000..ad28bcd0ce6ed --- /dev/null +++ b/pkgs/by-name/dv/dvb-apps/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, perl +, fetchpatch +}: +stdenv.mkDerivation { + pname = "dvb-apps"; + version = "1.1.1-unstable-2014-03-21"; + + src = fetchurl { + url = "https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2"; + hash = "sha256-854vDr7X4yvOg1IgYq1NQU9n/M1d8bZHYYUkSX4V4Fc="; + }; + + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-zSbbKSJgW4L983DR0GVXtgAHK6ILOQC3Gz2iGnmWOp8="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-GZunNYlhktalPOZ4ZST1MwooBvdDGA6ckscx/7mx8ok="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-+j+tP8O3mho+gcsDPzQUJaE39ZAgimMAJoRP1J1HrBk="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-jrRE1yySLbQWbF+SaugFN8VuEIfveSvjR0nKpmKffpQ="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-zIROx0HEvtZqvNBLlKp3aI3S2CihuS6l/OWf6WFFCrY="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-dLPlscdDOd7Kq+2sEhgJ/PBY1zN/0/fh3TU6JOELaYw="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-034TYxH1qHcdkwVxuAcNHORfBWhw/k8P+11QAc3jp74="; + }) + (fetchpatch { + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=779520;filename=bug779520.patch;msg=17"; + hash = "sha256-UL5lKDfloXvngsabnslpVXbe/dmt4dzVK5W8JkIieps="; + }) + ]; + + buildInputs = [ perl ]; + + installFlags = [ "prefix=$(out)" ]; + + dontConfigure = true; # skip configure + + meta = { + description = "Linux DVB API applications and utilities"; + homepage = "https://linuxtv.org/"; + maintainers = with lib.maintainers; [ volfyd ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 7db89e274e1ad..e2e5443991dd0 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-bEuzA67bBueHgKTpj+CsX7fZMc9RMV4cc7KOVqJfT7M="; + hash = "sha256-V0PuiF8N5ubNO4/EmGFx6qL0k1ziTVVKe+0rpMTMVlg="; }; - cargoHash = "sha256-JL31KVZrKPNlJzB3tyLheXZ3qVcm0HtAVuccehGkM0c="; + cargoHash = "sha256-kO4WxTDVmLlQpYuFbohih+4Hct2AmnO802Veuw2Wj2g="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index fe58b468b1f5e..536710faee505 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fortune-kind"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-txFboO7TdmwFm8BPP2onDJs1LSp4fXTwciIyAnC4Q04="; + hash = "sha256-8xXRIp6fNYo0Eylzz+i+YccEJZjqiT0TxguZheIblns="; }; - cargoHash = "sha256-3HxkKE2cQK91dBTtrsNG9VDk0efo1Ci5VfaG3UjvLNU="; + cargoHash = "sha256-v1LmZRuknWFAwwuw4U7Y7jnhBi8UkglY0sege9nSKes="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ge/gerrit-queue/package.nix b/pkgs/by-name/ge/gerrit-queue/package.nix new file mode 100644 index 0000000000000..e9369e8f0232f --- /dev/null +++ b/pkgs/by-name/ge/gerrit-queue/package.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gerrit-queue"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "flokli"; + repo = "gerrit-queue"; + rev = "v${version}"; + hash = "sha256-JkAYqqet6y89RTBU9FuxkMwJiGM6opL0reXbojSal3Y="; + }; + vendorHash = "sha256-+Ig4D46NphzpWKXO23Haea9EqVtpda8v9zLPJkbe3bQ="; + + meta = with lib; { + description = "Merge bot for Gerrit"; + homepage = "https://github.com/flokli/gerrit-queue"; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + mainProgram = "gerrit-queue"; + }; +} diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 23171c71fbecb..fbd8b9f1657de 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -7,20 +7,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-v/AFx40JWdbTCa008tDz/n9cXgpAkKv4rSiGJ8yx1YQ="; + hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = [ cmake pkg-config ]; + # Since "build" already exists and is populated, cmake tries to use it, + # throwing uncomprehensible error messages... cmakeBuildDir = "build-directory"; strictDeps = true; diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix new file mode 100644 index 0000000000000..d176bbacc89f2 --- /dev/null +++ b/pkgs/by-name/li/libcircle/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mpi +, lwgrp +}: + +stdenv.mkDerivation rec { + pname = "libcircle"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "libcircle"; + rev = "v${version}"; + hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "API for distributing embarrassingly parallel workloads using self-stabilization"; + homepage = "http://hpc.github.io/libcircle/"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 1c96f5d83a60d..e4782d2eed462 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1469"; + version = "1483"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-budBvpX2SnKekGTWHomvhW+4grB8EPd9OJbufNynHsc="; + hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; }; postPatch = '' diff --git a/pkgs/by-name/lw/lwgrp/package.nix b/pkgs/by-name/lw/lwgrp/package.nix new file mode 100644 index 0000000000000..c9c657bee32a1 --- /dev/null +++ b/pkgs/by-name/lw/lwgrp/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, mpi, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lwgrp"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "lwgrp"; + rev = "v${version}"; + hash = "sha256-f0tYn9FbrOz8iMoG8Is8vYDNfYHTfxLKNnyxJA+Msdk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Data structures and operations to group MPI processes as an ordered set"; + homepage = "https://github.com/LLNL/lwgrp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix new file mode 100644 index 0000000000000..ecc790cebc14a --- /dev/null +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -0,0 +1,33 @@ +{ lib, maven, fetchFromGitHub }: + +maven.buildMavenPackage rec { + pname = "mariadb-connector-java"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "mariadb-corporation"; + repo = "mariadb-connector-j"; + rev = "refs/tags/${version}"; + hash = "sha256-ssh6v2h/Ikl2Ulim6lSJ45avjKSCh3Vmtg+LPOgONRU="; + }; + + mvnHash = "sha256-MizBoFlpYxwwcU7rOac1h2VPJoXv3eRQgWRgsTh8Xno="; + + # Disable tests because they require networking + mvnParameters = "-DskipTests"; + + installPhase = '' + runHook preInstall + install -m444 -D target/mariadb-java-client-${version}.jar $out/share/java/mariadb-java-client.jar + runHook postInstall + ''; + + meta = with lib; { + description = "MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases"; + homepage = "https://mariadb.com/kb/en/about-mariadb-connector-j/"; + changelog = "https://mariadb.com/kb/en/mariadb-connector-j-release-notes/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ anthonyroussel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ma/mathjax-node-cli/package.nix b/pkgs/by-name/ma/mathjax-node-cli/package.nix new file mode 100644 index 0000000000000..d15f6bf67b629 --- /dev/null +++ b/pkgs/by-name/ma/mathjax-node-cli/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +}: + +buildNpmPackage rec { + pname = "mathjax-node-cli"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "mathjax"; + repo = "mathjax-node-cli"; + rev = version; + hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY="; + }; + + patches = [ + # https://github.com/mathjax/mathjax-node-cli/pull/20 + (fetchpatch { + name = "add-package-lock.patch"; + url = "https://github.com/mathjax/mathjax-node-cli/commit/ac304d896d840dc5004045f012abab40648d20fd.patch"; + hash = "sha256-kIfxF5II/PHtzBhhMbO2RcEuZQCNFrLeAnL536WBXq8="; + }) + ]; + + npmDepsHash = "sha256-gGTRr8CN6aP/T/jUqt4E53DYVaz7ykaoG519+3sPdXo="; + + dontNpmBuild = true; + + meta = { + description = "CLI tools for mathjax-node"; + homepage = "https://github.com/mathjax/mathjax-node-cli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} diff --git a/pkgs/by-name/mc/mcuboot-imgtool/package.nix b/pkgs/by-name/mc/mcuboot-imgtool/package.nix new file mode 100644 index 0000000000000..812c07f834633 --- /dev/null +++ b/pkgs/by-name/mc/mcuboot-imgtool/package.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, python3Packages +, nix-update-script +}: + +python3Packages.buildPythonApplication rec { + pname = "mfgtool-imgtool"; + version = "2.0.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "imgtool"; + hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ + cbor2 + click + cryptography + intelhex + ]; + + meta = with lib; { + description = "MCUboot's image signing and key management"; + homepage = "https://github.com/mcu-tools/mcuboot/tree/main/scripts"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + mainProgram = "imgtool"; + }; +} diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix new file mode 100644 index 0000000000000..2165b46e2b486 --- /dev/null +++ b/pkgs/by-name/me/memtree/package.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, python3Packages +}: + +python3Packages.buildPythonApplication { + pname = "memtree"; + version = "unstable-2023-11-04"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nbraud"; + repo = "memtree"; + rev = "093caeef26ee944b5bf4408710f63494e442b5ff"; + hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo="; + }; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + rich + ]; + + nativeCheckInputs = with python3Packages; [ + hypothesis + pytest + ]; + + checkPhase = '' + runHook preCheck + python -m pytest -v + runHook postCheck + ''; + + pythonImportChecks = [ "memtree" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Render cgroups tree annotated by memory usage"; + homepage = "https://github.com/nbraud/memtree"; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/mommy/default.nix b/pkgs/by-name/mo/mommy/package.nix index ae04e92c630b8..24e83eef6d092 100644 --- a/pkgs/tools/misc/mommy/default.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -23,28 +23,15 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-LT21MJg2rF84o2rWKguEP4UUOOu27nNGls95sBYgICw="; + hash = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; }; - patches = [ - # 🫣 mommy finds your config with an environment variable now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/d5785521fe2ce9ec832dbfe20abc483545b1df97.patch"; - hash = "sha256-GacUjQyvvwRRYKIHHTTAL0mQSPMZbbxacqilBaw807Y="; - }) - # 💜 mommy follows the XDG base directory specification now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/71806bc0ace2822ac32dc8dd5bb0b0881d849982.patch"; - hash = "sha256-Znq3VOgYI7a13Fqyz9nevtrvn7S5Jb2uBc78D0BG8rY="; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = [ shellspec ]; installFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix new file mode 100644 index 0000000000000..a27be47afa664 --- /dev/null +++ b/pkgs/by-name/mo/monaspace/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "monaspace"; + version = "1.000"; + + src = fetchzip { + url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; + stripRoot = false; + hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A="; + }; + + outputs = [ "out" "woff" ]; + + installPhase = '' + runHook preInstall + + pushd monaspace-v${finalAttrs.version}/fonts/ + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 variable/*.ttf -t $out/share/fonts/truetype + install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff + popd + + runHook postInstall + ''; + + meta = { + description = "An innovative superfamily of fonts for code"; + longDescription = '' + Since the earliest days of the teletype machine, code has been set in + monospaced type — letters, on a grid. Monaspace is a new type system that + advances the state of the art for the display of code on screen. + + Every advancement in the technology of computing has been accompanied by + advancements to the display and editing of code. CRTs made screen editors + possible. The advent of graphical user interfaces gave rise to integrated + development environments. + + Even today, we still have limited options when we want to layer additional + meaning on top of code. Syntax highlighting was invented in 1982 to help + children to code in BASIC. But beyond colors, most editors must + communicate with developers through their interfaces — hovers, underlines, + and other graphical decorations. + + Monaspace offers a more expressive palette for code and the tools we use + to work with it. + ''; + homepage = "https://monaspace.githubnext.com/"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix new file mode 100644 index 0000000000000..92300592c2fa8 --- /dev/null +++ b/pkgs/by-name/mp/mpifileutils/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mpi +, attr +, dtcmp +, libarchive +, libcircle +, bzip2 +, openssl +}: + +stdenv.mkDerivation rec { + pname = "mpifileutils"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "mpifileutils"; + rev = "v${version}"; + hash = "sha256-3nls82awMMCwlfafsOy3AY8OvT9sE+BvvsDOY14YvQc="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + attr + dtcmp + libarchive + libcircle + bzip2 + openssl + ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Suite of MPI-based tools to manage large datasets"; + homepage = "https://hpc.github.io/mpifileutils"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh b/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh new file mode 100755 index 0000000000000..17e7ce8a724c9 --- /dev/null +++ b/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +set -euo pipefail + +ip46tables() { + iptables -w "$@" + ip6tables -w "$@" + +} + +show_help() { + echo "nixos-firewall-tool" + echo "" + echo "Can temporarily manipulate the NixOS firewall" + echo "" + echo "Open TCP port:" + echo " nixos-firewall-tool open tcp 8888" + echo "" + echo "Show all firewall rules:" + echo " nixos-firewall-tool show" + echo "" + echo "Open UDP port:" + echo " nixos-firewall-tool open udp 51820" + echo "" + echo "Reset firewall configuration to system settings:" + echo " nixos-firewall-tool reset" +} + +if [[ -z ${1+x} ]]; then + show_help + exit 1 +fi + +case $1 in + "open") + protocol="$2" + port="$3" + + ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept + ;; + "show") + ip46tables --numeric --list nixos-fw + ;; + "reset") + systemctl restart firewall.service + ;; + -h|--help|help) + show_help + exit 0 + ;; + *) + show_help + exit 1 + ;; +esac diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix new file mode 100644 index 0000000000000..78af5cb8d5715 --- /dev/null +++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -0,0 +1,15 @@ +{ writeShellApplication, iptables, lib }: + +writeShellApplication { + name = "nixos-firewall-tool"; + text = builtins.readFile ./nixos-firewall-tool.sh; + runtimeInputs = [ + iptables + ]; + + meta = with lib; { + description = "Temporarily manipulate the NixOS firewall"; + license = licenses.mit; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/by-name/nn/nncp/package.nix index eb929c9923b18..902b78272da02 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/by-name/nn/nncp/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "nncp"; - version = "8.9.0"; + version = "8.10.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz"; - hash = "sha256-JZ+svDNU7cwW58ZOJ4qszbR/+j7Cr+oLNig/RqqCS10="; + sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc"; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ns/nsf-ordlista/package.nix b/pkgs/by-name/ns/nsf-ordlista/package.nix new file mode 100644 index 0000000000000..d3ec535c44e80 --- /dev/null +++ b/pkgs/by-name/ns/nsf-ordlista/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenvNoCC +, fetchzip +}: +stdenvNoCC.mkDerivation { + pname = "nsf-ordlista"; + version = "unstable-2023-08-20"; + src = fetchzip { + url = "http://www2.scrabbleforbundet.no/wp-content/uploads/2023/08/nsf2023.zip"; + hash = "sha256-bcVqZ2yPHurl6sRNgeLNAyyR8WR9ewmtn85Xuw/rZ3s="; + }; + + installPhase = '' + runHook preInstall + install -Dm444 nsf2023.txt $out/share/wordlists/nsf.txt + runHook postInstall + ''; + + meta = with lib; { + description = "Wordlist from the Norwegian Scrabble Federation"; + homepage = "https://www2.scrabbleforbundet.no/"; + downloadPage = "https://www2.scrabbleforbundet.no/?p=4881#more-4881"; + license = licenses.unfree; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 3543115eda493..5da88e6af8ede 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -24,6 +24,13 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules"; + + postInstall = '' + mkdir -p $out/share/${pname} + cp -r $src/${pname}/modules $out/share/${pname}/ + ''; + passthru.tests.version = testers.testVersion { package = numbat; }; diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix new file mode 100644 index 0000000000000..612575d2b2668 --- /dev/null +++ b/pkgs/by-name/oa/oauth2l/package.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "oauth2l"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "oauth2l"; + rev = "v${version}"; + hash = "sha256-bL1bys/CBo/P9VfWc/FB8JHW/aBwC521V8DB1sFBIAA="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = "export HOME=$(mktemp -d)"; + + # tests fail on linux for some reason + doCheck = stdenv.isDarwin; + + meta = with lib; { + description = "Simple CLI for interacting with Google API authentication"; + homepage = "https://github.com/google/oauth2l"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "oauth2l"; + }; +} diff --git a/pkgs/by-name/op/open-english-wordnet/package.nix b/pkgs/by-name/op/open-english-wordnet/package.nix new file mode 100644 index 0000000000000..ccd661753c059 --- /dev/null +++ b/pkgs/by-name/op/open-english-wordnet/package.nix @@ -0,0 +1,73 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, gzip +, python3 +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation (self: { + pname = "open-english-wordnet"; + version = "2022"; + + src = fetchFromGitHub { + owner = "globalwordnet"; + repo = "english-wordnet"; + rev = "${self.version}-edition"; + hash = "sha256-a1fWIp39uuJZL1aFX/r+ttLB1+kwh/XPHwphgENTQ5M="; + }; + + patches = lib.mapAttrsToList (rev: hash: fetchpatch { + url = "https://github.com/globalwordnet/english-wordnet/commit/${rev}.patch"; + inherit hash; + }) { + # Upstream commit bumping the version number, accidentally ommited from the tagged release + "bc07902f8995b62c70f01a282b23f40f30630540" = "sha256-1e4MG/k86g3OFUhiShCCbNXnvDKrYFr1KlGVsGl++KI="; + # PR #982, “merge.py: Make result independent of filesystem order” + "6da46a48dd76a48ad9ff563e6c807b8271fc83cd" = "sha256-QkkJH7NVGy/IbeSWkotU80IGF4esz0b8mIL9soHdQtQ="; + }; + + # TODO(nicoo): make compression optional? + nativeBuildInputs = [ + gzip + (python3.withPackages (p: with p; [ pyyaml ])) + ]; + + # TODO(nicoo): generate LMF and WNDB versions with separate outputs + buildPhase = '' + runHook preBuild + + echo Generating wn.xml + python scripts/from-yaml.py + python scripts/merge.py + + echo Compressing + gzip --best --no-name --stdout ./wn.xml > 'oewn:${self.version}.xml.gz' + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/share/wordnet 'oewn:${self.version}.xml.gz' + runHook postInstall + ''; + + meta = with lib; { + description = "Lexical network of the English language"; + longDescription = '' + Open English WordNet is a lexical network of the English language grouping + words into synsets and linking them according to relationships such as + hypernymy, antonymy and meronymy. It is intended to be used in natural + language processing applications and provides deep lexical information + about the English language as a graph. + + Open English WordNet is a fork of the Princeton Wordnet developed under an + open source methodology. + ''; + homepage = "https://en-word.net/"; + license = licenses.cc-by-40; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/python-modules/openai-triton/llvm.nix b/pkgs/by-name/op/openai-triton-llvm/package.nix index 70ea69a9b15fe..2fb56d0a63522 100644 --- a/pkgs/development/python-modules/openai-triton/llvm.nix +++ b/pkgs/by-name/op/openai-triton-llvm/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "triton-llvm"; + pname = "openai-triton-llvm"; version = "14.0.6-f28c006a5895"; outputs = [ diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index be4dc7159a3e1..cdaccc6b436ad 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.24.1"; + version = "0.24.2"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "v${version}"; - hash = "sha256-cIIMwQF0jqGQhNyX2qDBeKZlUNvdC6sBTv5LCxk8MMQ="; + hash = "sha256-tumEwaHXFLSXOmyQba4wBU5irvzZBL3BsCtF+Nlly+c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/by-name/po/polybar/package.nix index 9ecced78440b2..67b05b8f4b674 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -40,15 +40,15 @@ , i3Support ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "polybar"; - version = "3.6.3"; + version = "3.7.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE="; + owner = "polybar"; + repo = "polybar"; + rev = finalAttrs.version; + hash = "sha256-Z1rL9WvEZHr5M03s9KCJ6O6rNuaK7PpwUDaatYuCocI="; fetchSubmodules = true; }; @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/by-name/po/polybar/remove-hardcoded-etc.diff index d0c6db8b6b0ac..d0c6db8b6b0ac 100644 --- a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff +++ b/pkgs/by-name/po/polybar/remove-hardcoded-etc.diff diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix new file mode 100644 index 0000000000000..32cf7960825b3 --- /dev/null +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "qrtool"; + version = "0.8.4"; + + src = fetchFromGitHub { + owner = "sorairolake"; + repo = "qrtool"; + rev = "v${version}"; + sha256 = "sha256-FoWUGhNfVILpYxmsnSzRIM1+R9/xFxCF7W1sdiHaAiA="; + }; + + cargoSha256 = "sha256-mtejnHCkN2krgFAneyyBpvbv5PZO3GigM2DJqrbHim4="; + + meta = with lib; { + maintainers = with maintainers; [ philiptaron ]; + description = "An utility for encoding or decoding QR code"; + license = licenses.asl20; + homepage = "https://sorairolake.github.io/qrtool/book/index.html"; + changelog = "https://sorairolake.github.io/qrtool/book/changelog.html"; + mainProgram = "qrtool"; + }; +} diff --git a/pkgs/by-name/ro/rockyou/package.nix b/pkgs/by-name/ro/rockyou/package.nix new file mode 100644 index 0000000000000..7e6bb2f34c361 --- /dev/null +++ b/pkgs/by-name/ro/rockyou/package.nix @@ -0,0 +1,20 @@ +{ seclists +, stdenvNoCC +}: +stdenvNoCC.mkDerivation { + pname = "rockyou"; + inherit (seclists) version src; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/wordlists/ + tar -xvzf ${seclists}/share/wordlists/seclists/Passwords/Leaked-Databases/rockyou.txt.tar.gz -C $out/share/wordlists/ + + runHook postInstall + ''; + + meta = seclists.meta // { + description = "A famous wordlist often used for brute force attacks"; + }; +} diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix new file mode 100644 index 0000000000000..eaac606fbdb7c --- /dev/null +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, bison +, boost +, flex +, gputils +, texinfo +, zlib +, withGputils ? false +, excludePorts ? [] +}: + +assert lib.subtractLists [ + "ds390" "ds400" "gbz80" "hc08" "mcs51" "pic14" "pic16" "r2k" "r3ka" "s08" + "stm8" "tlcs90" "z80" "z180" +] excludePorts == []; +stdenv.mkDerivation (finalAttrs: { + pname = "sdcc"; + version = "4.2.0"; + + src = fetchurl { + url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; + hash = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; + }; + + outputs = [ "out" "doc" "man" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoconf + bison + flex + ]; + + buildInputs = [ + boost + texinfo + zlib + ] ++ lib.optionals withGputils [ + gputils + ]; + + configureFlags = let + excludedPorts = excludePorts + ++ (lib.optionals (!withGputils) [ "pic14" "pic16" ]); + in + map (f: "--disable-${f}-port") excludedPorts; + + preConfigure = '' + if test -n "''${dontStrip-}"; then + export STRIP=none + fi + ''; + + meta = { + homepage = "https://sdcc.sourceforge.net/"; + description = "Small Device C Compiler"; + longDescription = '' + SDCC is a retargettable, optimizing ANSI - C compiler suite that targets + the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), + Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) + HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit + 2000/3000, Rabbit 3000A). Work is in progress on supporting the Microchip + PIC16 and PIC18 targets. It can be retargeted for other microprocessors. + ''; + license = if withGputils + then lib.licenses.unfreeRedistributable + else lib.licenses.gpl2Plus; + mainProgram = "sdcc"; + maintainers = with lib.maintainers; [ bjornfor yorickvp ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix new file mode 100644 index 0000000000000..d01328a184199 --- /dev/null +++ b/pkgs/by-name/se/seclists/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "seclists"; + version = "2023.2"; + + src = fetchFromGitHub { + owner = "danielmiessler"; + repo = "SecLists"; + rev = "2023.2"; + hash = "sha256-yVxb5GaQDuCsyjIV+oZzNUEFoq6gMPeaIeQviwGdAgY="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/wordlists/seclists + find . -maxdepth 1 -type d -regextype posix-extended -regex '^./[A-Z].*' -exec cp -R {} $out/share/wordlists/seclists \; + find $out/share/wordlists/seclists -name "*.md" -delete + + runHook postInstall + ''; + + meta = with lib; { + description = "A collection of multiple types of lists used during security assessments, collected in one place"; + homepage = "https://github.com/danielmiessler/seclists"; + license = licenses.mit; + maintainers = with maintainers; [ tochiaha janik pamplemousse ]; + }; +} + diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix new file mode 100644 index 0000000000000..d1e20fa68a0ac --- /dev/null +++ b/pkgs/by-name/si/signal-export/package.nix @@ -0,0 +1,40 @@ +{ lib +, python3 +, fetchPypi +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "signal-export"; + version = "1.6.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1efc8jclXE4PQ/K9q1GC0mGqYo5lXXOIYEzz3RDNBGA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + typer + beautifulsoup4 + emoji + markdown + pysqlcipher3 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + mainProgram = "sigexport"; + homepage = "https://github.com/carderne/signal-export"; + description = "Export your Signal chats to markdown files with attachments."; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ phaer picnoir ]; + }; +} diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix new file mode 100644 index 0000000000000..c79cbf38f7cd1 --- /dev/null +++ b/pkgs/by-name/si/simde/package.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "simde"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "simd-everywhere"; + repo = "simde"; + rev = "v${version}"; + hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY="; + }; + + nativeBuildInputs = [ meson ninja ]; + + meta = with lib; { + homepage = "https://simd-everywhere.github.io"; + description = "Implementations of SIMD instruction sets for systems which don't natively support them"; + license = with licenses; [mit]; + maintainers = with maintainers; [ whiteley ]; + platforms = flatten (with platforms; [ + arm + armv7 + aarch64 + x86 + power + mips + ]); + }; +} diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index db635f073a630..f329dcfa794c7 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-elDVkhRW1mTez56OKQJJ0m0VxP8/Bq+HcXf5iokeY5I="; + hash = "sha256-DVduZ1qPbcDlH+B5hibC2HUjwEUV+CpDDpMI8GdPwro"; }; - vendorHash = "sha256-z1sDlyc7HW+tYfG0Z4EjUCEM3Su4JjmWIKxU2MV6GOA="; + vendorHash = "sha256-Dj6I+gt0gB5HWTWdFXCV5UpLuvg+HhuygRJAdvV/Yp8"; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index ae4c6bcd49428..1a6f813254413 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.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-ZoiT7Yf8Mdwh2vBkRCDxhkbvTkekhTopFNWjUnyoPUQ="; + hash = "sha256-RAMQC9weEvTV44nAXjwMYv+4O5aSNNM5UOf/xBb4SBE="; }; - cargoHash = "sha256-My/15zNfEqt+a0jganS6LfFiEXENUaPTcyz6SBL0oKo="; + cargoHash = "sha256-ZBedAIHwbRiR9i6w0CWIiE+OJvTkmxiEihn7zLAV/Dg="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix new file mode 100644 index 0000000000000..fb81063526cf1 --- /dev/null +++ b/pkgs/by-name/we/websecprobe/package.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "websecprobe"; + version = "0.0.10"; + pyproject = true; + + src = fetchPypi { + pname = "WebSecProbe"; + inherit version; + hash = "sha256-QvXOyQUptMyim/bgvhihjgGs7vX0qX8MqK2ol8q9ePc="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + tabulate + ]; + + postInstall = '' + mv $out/bin/WebSecProbe $out/bin/$pname + ''; + + pythonImportsCheck = [ + "WebSecProbe" + ]; + + meta = with lib; { + description = "Web Security Assessment Tool"; + homepage = "https://github.com/spyboy-productions/WebSecProbe/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "websecprobe"; + }; +} diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index 380f3f1caa9d2..0e4e5659318b7 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiremock"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar"; - hash = "sha256-voO9UAxhxQlWWs4jMji93TBUCcFWht/4Cea+UpBmL3Q="; + hash = "sha256-VgUJeQJeHNmmX1cS2s5hTljQZ8fIYr9uHYWMXjZjJzY="; }; dontUnpack = true; diff --git a/pkgs/by-name/wo/wordlists/package.nix b/pkgs/by-name/wo/wordlists/package.nix new file mode 100644 index 0000000000000..16106707fd96d --- /dev/null +++ b/pkgs/by-name/wo/wordlists/package.nix @@ -0,0 +1,70 @@ +{ lib +, callPackage +, nmap +, rockyou +, runtimeShell +, seclists +, symlinkJoin +, tree +, wfuzz +, lists ? [ + nmap + rockyou + seclists + wfuzz + ] +}: + +symlinkJoin rec { + pname = "wordlists"; + version = "unstable-2023-10-10"; + + name = "${pname}-${version}"; + paths = lists; + + postBuild = '' + mkdir -p $out/bin + + # Create a command to show the location of the links. + cat >> $out/bin/wordlists << __EOF__ + #!${runtimeShell} + ${tree}/bin/tree ${placeholder "out"}/share/wordlists + __EOF__ + chmod +x $out/bin/wordlists + + # Create a handy command for easy access to the wordlists. + # e.g.: `cat "$(wordlists_path)/rockyou.txt"`, or `ls "$(wordlists_path)/dirbuster"` + cat >> $out/bin/wordlists_path << __EOF__ + #!${runtimeShell} + printf "${placeholder "out"}/share/wordlists\n" + __EOF__ + chmod +x $out/bin/wordlists_path + ''; + + meta = with lib; { + description = "A collection of wordlists useful for security testing"; + longDescription = '' + The `wordlists` package provides two scripts. One is called {command}`wordlists`, + and it will list a tree of all the wordlists installed. The other one is + called {command}`wordlists_path` which will print the path to the nix store + location of the lists. You can for example do + {command}`$(wordlists_path)/rockyou.txt` to get the location of the + [rockyou](https://en.wikipedia.org/wiki/RockYou#Data_breach) + wordlist. If you want to modify the available wordlists you can override + the `lists` attribute`. In your nixos configuration this would look + similiar to this: + + ```nix + environment.systemPackages = [ + (pkgs.wordlists.override { lists = with pkgs; [ rockyou ] }) + ] + ``` + + you can use this with nix-shell by doing: + {command}`nix-shell -p 'wordlists.override { lists = with (import <nixpkgs> {}); [ nmap ]; }' + If you want to add a new package that provides wordlist/s the convention + is to copy it to {file}`$out/share/wordlists/myNewWordlist`. + ''; + maintainers = with maintainers; [ janik pamplemousse ]; + }; +} diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix new file mode 100644 index 0000000000000..772efc7015edb --- /dev/null +++ b/pkgs/by-name/wo/worker/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchurl +, libX11 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "worker"; + version = "4.12.1"; + + src = fetchurl { + url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz"; + hash = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; + }; + + buildInputs = [ libX11 ]; + + outputs = [ "out" "man" ]; + + strictDeps = true; + + meta = { + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; + description = "Advanced orthodox file manager"; + longDescription = '' + Worker is a two-pane file manager for the X Window System on UN*X. The + directories and files are shown in two independent panels supporting a lot + of advanced file manipulation features. The main focus is to make managing + files easy with full keyboard control, also assisting in finding files and + directories by using history of accessed directories, live filtering, and + access to commands by using the keyboard. + ''; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "worker"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 858e8400d0049..3845e65fecc5d 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -30,6 +30,6 @@ buildGoModule rec { "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; - maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; + maintainers = with maintainers; [ ehmry gazally lassulus ]; }; } diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix index f2e1f26f3b879..b9ec209dda730 100644 --- a/pkgs/by-name/zi/zitadel/console.nix +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -14,7 +14,7 @@ let workDir = "console"; bufArgs = "../proto --include-imports --include-wkt"; outputPath = "src/app/proto"; - hash = "sha256-s0dzmcjKd8ot7t+KlRlNVA9oiIDKVMnGOT/HjdaUjGI="; + hash = "sha256-NmlKjKWxmqatyR6OitlQ7bfl6U6PS6KWqTALwX42HS4="; }; in mkYarnPackage rec { @@ -26,7 +26,7 @@ mkYarnPackage rec { packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-48IC4LxqbkH+95k7rCmhRWT+qAlJ9CDXWwRjbric9no="; + hash = "sha256-rSKoIznYVDNgrBmut7YSxNhgPJnbIeO+/s0HnrYWPUc="; }; postPatch = '' diff --git a/pkgs/by-name/zi/zitadel/package.json b/pkgs/by-name/zi/zitadel/package.json index 0add6d2556b18..5819fdd77aed7 100644 --- a/pkgs/by-name/zi/zitadel/package.json +++ b/pkgs/by-name/zi/zitadel/package.json @@ -12,20 +12,20 @@ }, "private": true, "dependencies": { - "@angular/animations": "^16.2.0", - "@angular/cdk": "^16.2.0", - "@angular/common": "^16.2.0", - "@angular/compiler": "^16.2.0", - "@angular/core": "^16.2.0", - "@angular/forms": "^16.2.0", - "@angular/material": "^16.2.0", - "@angular/material-moment-adapter": "^16.2.0", - "@angular/platform-browser": "^16.2.0", - "@angular/platform-browser-dynamic": "^16.2.0", - "@angular/router": "^16.2.0", - "@angular/service-worker": "^16.2.0", + "@angular/animations": "^16.2.5", + "@angular/cdk": "^16.2.4", + "@angular/common": "^16.2.5", + "@angular/compiler": "^16.2.5", + "@angular/core": "^16.2.5", + "@angular/forms": "^16.2.5", + "@angular/material": "^16.2.4", + "@angular/material-moment-adapter": "^16.2.4", + "@angular/platform-browser": "^16.2.5", + "@angular/platform-browser-dynamic": "^16.2.5", + "@angular/router": "^16.2.5", + "@angular/service-worker": "^16.2.5", "@ctrl/ngx-codemirror": "^6.1.0", - "@grpc/grpc-js": "^1.8.14", + "@grpc/grpc-js": "^1.9.3", "@ngx-translate/core": "^14.0.0", "angular-oauth2-oidc": "^15.0.1", "angularx-qrcode": "^16.0.0", @@ -41,8 +41,8 @@ "libphonenumber-js": "^1.10.30", "material-design-icons-iconfont": "^6.1.1", "moment": "^2.29.4", - "opentype.js": "^1.3.4", "ngx-color": "^9.0.0", + "opentype.js": "^1.3.4", "rxjs": "~7.8.0", "tinycolor2": "^1.6.0", "tslib": "^2.4.1", @@ -50,29 +50,29 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.2.0", - "@angular-eslint/builder": "16.1.0", - "@angular-eslint/eslint-plugin": "16.1.0", - "@angular-eslint/eslint-plugin-template": "16.1.0", - "@angular-eslint/schematics": "16.1.0", - "@angular-eslint/template-parser": "16.1.0", - "@angular/cli": "^16.2.0", - "@angular/compiler-cli": "^16.2.0", - "@angular/language-service": "^16.2.0", + "@angular-devkit/build-angular": "^16.2.2", + "@angular-eslint/builder": "16.2.0", + "@angular-eslint/eslint-plugin": "16.2.0", + "@angular-eslint/eslint-plugin-template": "16.2.0", + "@angular-eslint/schematics": "16.2.0", + "@angular-eslint/template-parser": "16.2.0", + "@angular/cli": "^16.2.2", + "@angular/compiler-cli": "^16.2.5", + "@angular/language-service": "^16.2.5", "@bufbuild/buf": "^1.23.1", "@types/file-saver": "^2.0.2", "@types/google-protobuf": "^3.15.3", - "@types/jasmine": "~4.3.3", + "@types/jasmine": "~4.3.6", "@types/jasminewd2": "~2.0.10", "@types/jsonwebtoken": "^9.0.1", - "@types/node": "^18.15.11", + "@types/node": "^20.7.0", "@types/opentype.js": "^1.3.4", - "@types/qrcode": "^1.5.0", + "@types/qrcode": "^1.5.2", "@types/uuid": "^9.0.2", "@typescript-eslint/eslint-plugin": "^5.59.11", "@typescript-eslint/parser": "^5.60.1", "codelyzer": "^6.0.2", - "eslint": "^8.44.0", + "eslint": "^8.50.0", "jasmine-core": "~4.6.0", "jasmine-spec-reporter": "~7.0.0", "karma": "^6.4.2", @@ -80,7 +80,7 @@ "karma-coverage-istanbul-reporter": "^3.0.3", "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.1.0", - "prettier": "^2.8.7", + "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.2", "protractor": "~7.0.0", "typescript": "^4.9.5" diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index cd4780965e138..03216c406209f 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -15,14 +15,14 @@ }: let - version = "2.37.2"; + version = "2.40.3"; zitadelRepo = fetchFromGitHub { owner = "zitadel"; repo = "zitadel"; rev = "v${version}"; - hash = "sha256-iWEL7R7eNDV4c1CZhmxxiHHI9ExwU6gnmHI6ildaXWY="; + hash = "sha256-WqsK6DAYkLs5wBNvkVGarLMm/unBLtipFkl07pR90HI="; }; - goModulesHash = "sha256-lk4jEiI85EKk0G4JCHvCazqBBTfiNJqSfzvrJgDZ1Nc="; + goModulesHash = "sha256-IVf1YVnhyEYgZqM31Cv3aBFnPG7v5WW6fCEvlN+sTIE="; buildZitadelProtocGen = name: buildGo121Module { @@ -91,7 +91,7 @@ let protoc-gen-zitadel ]; outputPath = ".artifacts"; - hash = "sha256-+9UFBWBuSYNbfimKwJUSoiUh+8bDHGnPdx1MKDul1U4="; + hash = "sha256-xrEF1B4pMoCZs1WO9F6IoqHnSyt5BhPVTIABMWK/q2E="; }; in buildGo121Module rec { diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 26fa5ec670704..afb7ba4c069ca 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "58.10"; + version = "58.11"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-eBokpah7j3QQChprvjeigt2/sEpkq6ZS4rQhIP5cAYo="; + hash = "sha256-XewHMsHF65LvoRzPFiDQcClVSTfSCn69iDRjwKTLpRs="; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 462b06054f3fb..18f4d13197393 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://zealdocs.org/"; changelog = "https://github.com/zealdocs/zeal/releases"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; inherit (qtbase.meta) platforms; }; }) diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 53592152a3334..dec1ea062bbc4 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { description = "Pan-unicode version of Fixedsys, a classic DOS font"; platforms = lib.platforms.all; license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.ninjatrappeur ]; + maintainers = [ lib.maintainers.picnoir ]; }; } diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index df68dbb844c5b..8364c84f1ffc8 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.17"; + version = "1.0.20"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE="; + hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; }; dontUnpack = true; diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/data/icons/hackneyed/default.nix index 74aedaa3786e2..e26a32b159ecf 100644 --- a/pkgs/data/icons/hackneyed/default.nix +++ b/pkgs/data/icons/hackneyed/default.nix @@ -1,29 +1,41 @@ -{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: +{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; }; - buildInputs = [ imagemagick6 inkscape xcursorgen ]; + nativeBuildInputs = [ imagemagick inkscape xcursorgen ]; postPatch = '' patchShebangs *.sh - substituteInPlace make-png.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape ''; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "INKSCAPE=inkscape" + "INSTALL=install" + "PREFIX=$(out)" + "VERBOSE=1" + "XCURSORGEN=xcursorgen" + ]; + buildFlags = [ "theme" "theme.left" ]; + # The Makefile declares a dependency on the value of $(INKSCAPE) for some reason; + # it's unnecessary for building though. + prePatch = '' + substituteInPlace GNUmakefile \ + --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' + ''; + meta = with lib; { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; diff --git a/pkgs/data/icons/reversal-icon-theme/default.nix b/pkgs/data/icons/reversal-icon-theme/default.nix new file mode 100644 index 0000000000000..b636bba4a3012 --- /dev/null +++ b/pkgs/data/icons/reversal-icon-theme/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, jdupes +, adwaita-icon-theme +, hicolor-icon-theme +, numix-icon-theme-circle +, gitUpdater +, allColorVariants ? false +, colorVariants ? [] +}: + +let + pname = "reversal-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2023-05-13"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = pname; + rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; + hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + adwaita-icon-theme + hicolor-icon-theme + numix-icon-theme-circle + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install many small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + + name= ./install.sh \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + -d $out/share/icons + + rm $out/share/icons/*/{AUTHORS,COPYING} + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A colorful Design Rectangle icon theme"; + homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index fd0f1b5647334..cbfd42dfc874e 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "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" + "commit": "49d09494dd24eae895fe1260e2c26157f740e451", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", + "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", + "msg": "Update from Hackage at 2023-10-21T19:49:07Z" } diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/data/misc/papirus-folders/default.nix index 24fbeb0b0e23d..a44a382c4b40a 100644 --- a/pkgs/data/misc/papirus-folders/default.nix +++ b/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; + sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs="; }; buildInputs = [ diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix index 5191199e64712..abe1ea4ceac6c 100644 --- a/pkgs/data/soundfonts/generaluser/default.nix +++ b/pkgs/data/soundfonts/generaluser/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # we can't use fetchurl since stdenv does not handle unpacking *.zip's by default. src = fetchzip { - # Linked on http://www.schristiancollins.com/generaluser.php: + # Linked on https://www.schristiancollins.com/generaluser.php: url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits"; - homepage = "http://www.schristiancollins.com/generaluser.php"; + homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; maintainers = with maintainers; [ ckie ]; diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix index a117562174e5b..dc3273e695b1e 100644 --- a/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -1,38 +1,38 @@ { lib -, stdenvNoCC -, fetchFromGitHub +, callPackage +, runCommand , gtk-engine-murrine +, gnome-themes-extra }: -stdenvNoCC.mkDerivation { - pname = "tokyo-night-gtk"; - version = "2023.01.17"; +let + prefix = "tokyo-night-gtk"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; - sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; - }; + packages = lib.mapAttrs' (type: content: { + name = type; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + value = lib.mapAttrs' (variantName: variant: { + name = variantName; + value = callPackage ./generic.nix { inherit prefix type variantName variant; }; + }) content; + }) (lib.importJSON ./variants.json); +in packages // { + # Not using `symlinkJoin` because it's massively inefficient in this case + full = runCommand "${prefix}_full" { + preferLocalBuild = true; - dontBuild = true; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + } '' + mkdir -p $out/share/{icons,themes,${prefix}} - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cp -a themes/* $out/share/themes - runHook postInstall + ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: + '' + ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} + ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true + '' + ))} ''; - - meta = with lib; { - description = "A GTK theme based on the Tokyo Night colour palette."; - homepage = "www.pling.com/p/1681315/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ garaiza-93 ]; - }; } diff --git a/pkgs/data/themes/tokyo-night-gtk/generic.nix b/pkgs/data/themes/tokyo-night-gtk/generic.nix new file mode 100644 index 0000000000000..35bf498666da9 --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/generic.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeScript +, gtk-engine-murrine +, gnome-themes-extra +, prefix ? "" +, type ? "" +, variantName ? "" +, variant ? "" +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${prefix}_${type}-${variantName}"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "e9790345a6231cd6001f1356d578883fac52233a"; + hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{${type},${prefix}} + cp -a ${type}/Tokyonight-${variant} $out/share/${type} + cp -a LICENSE $out/share/${prefix} + + runHook postInstall + ''; + + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts tree jq + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" + + rev="$(echo $res | jq '.sha' --raw-output)" + version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" + update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash + + commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' + commonjq2='reduce inputs as $in (.; . + $in)' + commontree="-dJ -L 1 --noreport ${finalAttrs.src}" + + echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ + $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ + jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ + "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" + ''; + + # For "full" in default.nix + ptype = type; + pvariant = variant; + }; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette"; + homepage = "https://www.pling.com/p/1681315"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ garaiza-93 Madouura ]; + }; +}) diff --git a/pkgs/data/themes/tokyo-night-gtk/variants.json b/pkgs/data/themes/tokyo-night-gtk/variants.json new file mode 100644 index 0000000000000..6489d9c649dee --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/variants.json @@ -0,0 +1,18 @@ +{ + "icons": { + "dark": "Dark", + "dark-cyan": "Dark-Cyan", + "light": "Light", + "moon": "Moon" + }, + "themes": { + "dark-b": "Dark-B", + "dark-bl": "Dark-BL", + "dark-b-lb": "Dark-B-LB", + "dark-bl-lb": "Dark-BL-LB", + "storm-b": "Storm-B", + "storm-bl": "Storm-BL", + "storm-b-lb": "Storm-B-LB", + "storm-bl-lb": "Storm-BL-LB" + } +} diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index b95dd4b6fdf26..4a9a878d31c77 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -19,18 +19,18 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; + hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0="; }; nativeBuildInputs = [ cmake pkg-config lxqt.lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools libconfig ]; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index fbac7dbd034d0..eacdac554136e 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -18,6 +18,7 @@ let lxqt-admin = callPackage ./lxqt-admin {}; lxqt-config = callPackage ./lxqt-config {}; lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-menu-data = callPackage ./lxqt-menu-data {}; lxqt-notificationd = callPackage ./lxqt-notificationd {}; lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; lxqt-policykit = callPackage ./lxqt-policykit {}; @@ -26,7 +27,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 @@ -36,7 +37,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = qt5.callPackage ./compton-conf {}; + compton-conf = callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; @@ -50,7 +51,6 @@ let libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra - pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager qt5.qtsvg # provides QT5 plugins for svg icons @@ -68,6 +68,7 @@ let lxqt-admin lxqt-config lxqt-globalkeys + lxqt-menu-data lxqt-notificationd lxqt-openssh-askpass lxqt-policykit diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index a19a8a208330a..c945107aaf3bc 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -4,6 +4,7 @@ , cmake , pkg-config , lxqt-build-tools +, lxqt-menu-data , pcre , libexif , xorg @@ -16,29 +17,30 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg="; + hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ + lxqt-menu-data pcre libexif xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp qtx11extras - qttools libfm menu-cache ]; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index c7a34a9c493cc..f7fba687bb868 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms="; + hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg polkit-qt kwindowsystem diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 4f155f39576ad..f2c42ccca5924 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc="; + hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 4fdfa341e9231..5e3514310c3d3 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0z2r8041vqssm59lkb3ka7qis9br4wvavxzd45m3pnqlp7wwhkbn"; + hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index f33e6986d8c70..ec95c19b0c5a7 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -18,24 +18,24 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E="; + hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg qtimageformats # add-on module to support more image file formats diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 993721b443e50..fd20c68ba863e 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,23 +14,23 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o="; + hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 540c04b85c591..fc911cf27ea50 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY="; + hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index b8e31a378c25e..40cad3cb60826 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -16,19 +16,20 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU="; + hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -37,7 +38,6 @@ mkDerivation rec { libfm-qt menu-cache qtbase - qttools qtx11extras ]; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f31d1561bb52f..b3874abfa576d 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; + hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; }; postPatch = '' diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 2c8c5d9b4a678..64b54b3e6bc37 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,11 +1,11 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , pkg-config , glib , lxqt-build-tools +, lxqt-menu-data , qtbase , qtx11extras , qttools @@ -21,31 +21,32 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk="; + hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ glib.bin qtbase qtx11extras - qttools qtsvg kwindowsystem libkscreen liblxqt libqtxdg + lxqt-menu-data xorg.libpthreadstubs xorg.libXdmcp xorg.libXScrnSaver diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 6bdcc59bc353d..83235bfdaebd0 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo="; + hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix new file mode 100644 index 0000000000000..5ac4a5b0b7149 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qttools +, gitUpdater +}: + +mkDerivation rec { + pname = "lxqt-menu-data"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = pname; + rev = version; + hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + qttools + ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/lxqt/lxqt-menu-data"; + description = "Menu files for LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.lxqt.members; + }; +} diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 47792b35388d3..a39c560d48d07 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw="; + hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg kwindowsystem liblxqt diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a14cbd7da243d..f53c4ea05f8d1 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM="; + hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index fb901742ea652..16895a1aa9563 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -14,9 +14,9 @@ , libstatgrab , libsysstat , lm_sensors -, lxmenu-data , lxqt-build-tools , lxqt-globalkeys +, lxqt-menu-data , gitUpdater , menu-cache , pcre @@ -30,19 +30,20 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0="; + hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -57,13 +58,12 @@ mkDerivation rec { libstatgrab libsysstat lm_sensors - lxmenu-data lxqt-globalkeys + lxqt-menu-data menu-cache pcre qtbase qtsvg - qttools qtx11extras solid xorg.libXdmcp diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 0478c108e2196..da3480b73e39b 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,24 +19,24 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg="; + hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg polkit diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 32834a4a49a40..1823e7fb5d0dd 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,23 +18,23 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE="; + hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 4b27307520cd2..264575b019d89 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,18 +15,19 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg="; + hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -35,7 +36,6 @@ mkDerivation rec { libqtxdg qtbase qtsvg - qttools qtx11extras ]; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 7300331ab98e6..3d5bdf0a01b8c 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4="; + hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 6de643d727375..421d166734f1b 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk="; + hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 6d5fd9da85465..73794bad7a1fc 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,23 +16,23 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs="; + hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cbc1949b20d2..a9a957091df44 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; + hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 2adfc9ac2dcf9..4ebd052a5ef40 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,25 +15,25 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zxwQfKowgpLjfxSV2t7Ly8o7DFqoIxi60zIVCcKDQWo="; + hash = "sha256-ExBcP+j1uf9Y8f6YfZsqyD6YTx1PriS3w8I6qdqQGeE="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ pcre qtbase - qttools qtx11extras xorg.libpthreadstubs xorg.libXdmcp diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 3bff6b7f1eb32..f5b69b2e85faa 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -3,38 +3,34 @@ , fetchFromGitHub , cmake , pkg-config -, lxqt +, lxqt-build-tools , libpulseaudio -, pcre , qtbase , qttools -, qtx11extras , gitUpdater }: mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ="; + hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools - qtx11extras libpulseaudio - pcre ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b26c30b14e0cd..ea2f60474574e 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -4,43 +4,43 @@ , cmake , pkg-config , libexif -, lxqt +, lxqt-build-tools +, lxqt-menu-data , qtbase , qttools , qtx11extras , qtimageformats , libfm-qt , menu-cache -, lxmenu-data , gitUpdater }: mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo="; + hash = "sha256-+U8eV6oDpaJfTzejsVtbcaQrfSjWUnVpnIDbkvVCY/c="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ libexif + lxqt-menu-data qtbase - qttools qtx11extras qtimageformats # add-on module to support more image file formats libfm-qt menu-cache - lxmenu-data ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index 64ce835d3a66c..91f11e8d13748 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -15,16 +15,16 @@ mkDerivation rec { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; + hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834="; }; nativeBuildInputs = [ cmake + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 4873c1055cbe8..0b6b81a4e39f0 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,18 +14,19 @@ mkDerivation rec { pname = "qps"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY="; + hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -33,7 +34,6 @@ mkDerivation rec { liblxqt libqtxdg qtbase - qttools qtx11extras ]; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 0573c36924fbd..0a1bf1f82d124 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,23 +13,23 @@ mkDerivation rec { pname = "qterminal"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU="; + hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtermwidget ]; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 719183095a963..e92df23f2d5f9 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,23 +11,23 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs="; + hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index aa8ea1acd9794..10476a00cf731 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtxdg-tools"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc="; + hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index f4f94e2378654..59513dfebfdad 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,25 +17,25 @@ mkDerivation rec { pname = "screengrab"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4="; + hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78="; }; nativeBuildInputs = [ cmake pkg-config perl # needed by LXQtTranslateDesktop.cmake + qttools autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 9f6a8f3ecf4ac..622a445bb9fdd 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw="; + hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index ebf99d6ed0fa8..61d9c120b2461 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.1.2"; + version = "7.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU="; + sha256 = "sha256-0fDbR28gh7F8Bcnofn48BBP1CTsYnfmY5kG72ookOXw="; }; patches = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 1c0cd3f1474d1..f63453250b3d7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.8.0"; + version = "2.8.1"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU="; + sha256 = "sha256-cKEybD/eTHdS1LXSS1r6QTBnfDiX7nYwnmGKTaagbrs="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index d48dc38a4b8d4..e5b44bc5dcdb0 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,19 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }@inputs: +{ stdenv +, lib +, elixir +, erlang +, hex +, git +, rebar +, rebar3 +, fetchMixDeps +, findutils +, makeWrapper +, coreutils +, gnused +, gnugrep +, gawk +}@inputs: { pname , version @@ -10,80 +25,104 @@ , mixEnv ? "prod" , compileFlags ? [ ] - # mix fixed output derivation dependencies + # Mix dependencies provided as a fixed output derivation , mixFodDeps ? null - # mix dependencies generated by mix2nix - # this assumes each dependency is built by buildMix or buildRebar3 - # each dependency needs to have a setup hook to add the lib path to $ERL_LIBS - # this is how mix will find dependencies + # Mix dependencies generated by mix2nix + # + # This assumes each dependency is built by buildMix or buildRebar3. Each + # dependency needs to have a setup hook to add the lib path to $ERL_LIBS. + # This is how Mix finds dependencies. , mixNixDeps ? { } , elixir ? inputs.elixir , hex ? inputs.hex.override { inherit elixir; } -# This reduces closure size, but can lead to some hard to understand runtime -# errors, so use with caution. See e.g. -# https://github.com/whitfin/cachex/issues/205 -# https://framagit.org/framasoft/mobilizon/-/issues/1169 + # Remove releases/COOKIE + # + # People have different views on the nature of cookies. Some believe that they are + # secrets, while others believe they are just ids for clustering nodes instead of + # secrets. + # + # If you think cookie is secret, you can set this attr to true, then it will be + # removed from nix store. If not, you can set it to false. + # + # For backward compatibility, it is set to true by default. + # + # You can always specify a custom cookie by using RELEASE_COOKIE environment + # variable, regardless of the value of this attr. +, removeCookie ? true + + # This reduces closure size, but can lead to some hard to understand runtime + # errors, so use with caution. See e.g. + # https://github.com/whitfin/cachex/issues/205 + # https://framagit.org/framasoft/mobilizon/-/issues/1169 , stripDebug ? false , ... }@attrs: let - # remove non standard attributes that cannot be coerced to strings + # Remove non standard attributes that cannot be coerced to strings overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ]; in assert mixNixDeps != { } -> mixFodDeps == null; assert stripDebug -> !enableDebugInfo; stdenv.mkDerivation (overridable // { - # rg is used as a better grep to search for erlang references in the final release - nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ]; - buildInputs = buildInputs ++ builtins.attrValues mixNixDeps; + nativeBuildInputs = nativeBuildInputs ++ + # Erlang/Elixir deps + [ erlang elixir hex git ] ++ + # Mix deps + (builtins.attrValues mixNixDeps) ++ + # other compile-time deps + [ findutils makeWrapper ]; + + buildInputs = buildInputs; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; + DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation - # the api with `mix local.rebar rebar path` makes a copy of the binary - # some older dependencies still use rebar + # The API with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar. MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; + LC_ALL = "C.UTF-8"; postUnpack = '' - export HEX_HOME="$TEMPDIR/hex" + # Mix and Hex export MIX_HOME="$TEMPDIR/mix" + export HEX_HOME="$TEMPDIR/hex" # Rebar export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" ${lib.optionalString (mixFodDeps != null) '' - # compilation of the dependencies will require - # that the dependency path is writable - # thus a copy to the TEMPDIR is inevitable here + # Compilation of the dependencies will require that the dependency path is + # writable, thus a copy to the $TEMPDIR is inevitable here. export MIX_DEPS_PATH="$TEMPDIR/deps" cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" - '' - } - + ''} '' + (attrs.postUnpack or ""); configurePhase = attrs.configurePhase or '' runHook preConfigure ${./mix-configure-hook.sh} - # this is needed for projects that have a specific compile step + + # This is needed for projects that have a specific compile step # the dependency needs to be compiled in order for the task - # to be available - # Phoenix projects for example will need compile.phoenix + # to be available. + # + # Phoenix projects for example will need compile.phoenix. mix deps.compile --no-deps-check --skip-umbrella-children # Symlink dependency sources. This is needed for projects that require # access to the source of their dependencies. For example, Phoenix - # applications need javascript assets to build asset bundles. + # projects need javascript assets to build asset bundles. ${lib.optionalString (mixNixDeps != { }) '' mkdir -p deps @@ -113,7 +152,6 @@ stdenv.mkDerivation (overridable // { runHook postBuild ''; - installPhase = attrs.installPhase or '' runHook preInstall @@ -122,42 +160,50 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; - # Stripping of the binary is intentional - # even though it does not affect beam files - # it is necessary for NIFs binaries postFixup = '' - if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls - rm "$out/bin/${pname}.bat" # windows file - fi - # contains secrets and should not be in the nix store - # TODO document how to handle RELEASE_COOKIE - # secrets should not be in the nix store. - # This is only used for connecting multiple nodes - if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls + # Remove files for Microsoft Windows + rm -f "$out"/bin/*.bat + + # Wrap programs in $out/bin with their runtime deps + for f in $(find $out/bin/ -type f -executable); do + wrapProgram "$f" \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + gnused + gnugrep + gawk + ]} + done + '' + lib.optionalString removeCookie '' + if [ -e $out/releases/COOKIE ]; then rm $out/releases/COOKIE fi - # removing unused erlang reference from resulting derivation to reduce - # closure size - if [ -e $out/erts-* ]; then - echo "ERTS found in $out - removing references to erlang to reduce closure size" - # there is a link in $out/erts-*/bin/start always - # TODO: - # sometimes there are links in dependencies like bcrypt compiled binaries - # at the moment those are not removed since substituteInPlace will - # error on binaries - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do - echo "removing reference to erlang in $file" - substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" - done - fi '' + lib.optionalString stripDebug '' - # strip debug symbols to avoid hardreferences to "foreign" closures actually + # Strip debug symbols to avoid hardreferences to "foreign" closures actually # not needed at runtime, while at the same time reduce size of BEAM files. erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop ''; - # TODO investigate why the resulting closure still has - # a reference to erlang. - # uncommenting the following will fail the build - # disallowedReferences = [ erlang ]; + # TODO: remove erlang references in resulting derivation + # + # # Step 1 - investigate why the resulting derivation still has references to erlang. + # + # The reason is that the generated binaries contains erlang reference. Here's a repo to + # demonstrate the problem - <https://github.com/plastic-gun/nix-mix-release-unwanted-references>. + # + # + # # Step 2 - remove erlang references from the binaries + # + # As said in above repo, it's hard to remove erlang references from `.beam` binaries. + # + # We need more experienced developers to resolve this issue. + # + # + # # Tips + # + # When resolving this issue, it is convenient to fail the build when erlang is referenced, + # which can be achieved by using: + # + # disallowedReferences = [ erlang ]; + # }) diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index b884809505f33..621887d6cd124 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -84,7 +84,8 @@ let runHook postInstall ''; - postInstall = '' + # Release will generate a binary which will cause a read null byte failure, see #261354 + postInstall = lib.optionalString (releaseType == "escript") '' for dir in $out/rel/*/erts-*; do echo "ERTS found in $dir - removing references to erlang to reduce closure size" for f in $dir/bin/{erl,start}; do diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 31eda13e26b07..daf086e587b8f 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw="; + hash = "sha256-5UOLfsNgtg5EDDId23ysmWfeqMeh8R2UfMeBAtFCx6s="; }; - cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg="; + cargoHash = "sha256-YoPStyPeEqLoUvGLEPwXR8XVhXtb6XwFuPNoDCiT7OA="; nativeCheckInputs = [ rustfmt diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 1f934ef5d4607..681549fa62dbe 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -361,7 +361,7 @@ backendStdenv.mkDerivation rec { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; - license = licenses.unfree; + license = licenses.nvidiaCuda; maintainers = teams.cuda.members; }; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 038841a7097d0..1e4a3ab178559 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -39,7 +39,7 @@ let inherit (lib.meta) getExe; inherit (lib.strings) optionalString; in -backendStdenv.mkDerivation { +backendStdenv.mkDerivation (finalAttrs: { # NOTE: Even though there's no actual buildPhase going on here, the derivations of the # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are @@ -164,11 +164,15 @@ backendStdenv.mkDerivation { outputSpecified = true; meta = { - inherit description platforms; - license = lib.licenses.unfree; + inherit platforms; + description = "${description}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; + license = lib.licenses.nvidiaCudaRedist // { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.license_path or "${pname}/LICENSE.txt"}"; + }; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = lib.teams.cuda.members; # Force the use of the default, fat output by default (even though `dev` exists, which # causes Nix to prefer that output over the others if outputSpecified isn't set). outputsToInstall = [ "out" ]; }; -} +}) diff --git a/pkgs/development/compilers/elm/packages/lamdera.nix b/pkgs/development/compilers/elm/packages/lamdera.nix index d9727996e0536..e3dda4c31a524 100644 --- a/pkgs/development/compilers/elm/packages/lamdera.nix +++ b/pkgs/development/compilers/elm/packages/lamdera.nix @@ -7,16 +7,16 @@ let arch = if stdenv.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "b13110bacc3f71c2a3e12c52172a821a85cc13243a95249ca18c8beb296c0ce8"; - "aarch64-linux" = "afbc71f0570b86215942d1b4207fe3de0299e6fdfd2e6caac78bf688c81b9bd1"; - "x86_64-darwin" = "50a3df09b02b34e1653beb1507c6de0f332674e088ded7c66af4e5987753304e"; - "aarch64-darwin" = "174a5bfec355361c4f030861405513818be25fd7e4325f7221aa71ebd27475d3"; + "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; + "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; + "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; + "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix new file mode 100644 index 0000000000000..70b4b75369a7d --- /dev/null +++ b/pkgs/development/compilers/gcc/all.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, gccStdenv +, gcc7Stdenv +, callPackage +, isl_0_11, isl_0_14, isl_0_17, isl_0_20 +, libcCross +, threadsCrossFor +, noSysDirs +, texinfo5 +, cloog_0_18_0, cloog +, lowPrio +, wrapCC +}@args: + +let + versions = import ./versions.nix; + gccForMajorMinorVersion = majorMinorVersion: + let + atLeast = lib.versionAtLeast majorMinorVersion; + attrName = "gcc${lib.replaceStrings ["."] [""] majorMinorVersion}"; + pkg = lowPrio (wrapCC (callPackage ./default.nix ({ + inherit noSysDirs; + inherit majorMinorVersion; + reproducibleBuild = true; + profiledCompiler = false; + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { }; + isl = if stdenv.isDarwin then null + else if atLeast "9" then isl_0_20 + else if atLeast "7" then isl_0_17 + else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) + else if atLeast "4.9" then isl_0_11 + else /* "4.8" */ isl_0_14; + } // lib.optionalAttrs (majorMinorVersion == "4.8") { + texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump + } // lib.optionalAttrs (!(atLeast "6")) { + cloog = if stdenv.isDarwin + then null + else if atLeast "4.9" then cloog_0_18_0 + else /* 4.8 */ cloog; + } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + }))); + in + lib.nameValuePair attrName pkg; +in +lib.listToAttrs (map gccForMajorMinorVersion versions.allMajorVersions) + diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 4544f3862fea3..0fe23000cc900 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -33,6 +33,7 @@ , nukeReferences , callPackage , majorMinorVersion +, darwin # only for gcc<=6.x , langJava ? false @@ -47,18 +48,8 @@ }: let - version = { - "13" = "13.2.0"; - "12" = "12.3.0"; - "11" = "11.4.0"; - "10" = "10.5.0"; - "9" = "9.5.0"; - "8" = "8.5.0"; - "7" = "7.5.0"; - "6" = "6.5.0"; - "4.9"= "4.9.4"; - "4.8"= "4.8.5"; - }."${majorMinorVersion}"; + versions = import ./versions.nix; + version = versions.fromMajorMinor majorMinorVersion; majorVersion = lib.versions.major version; atLeast13 = lib.versionAtLeast version "13"; @@ -255,18 +246,8 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ else if atLeast6 then "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz" else "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - ${if is10 || is11 || is13 then "hash" else "sha256"} = { - "13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; - "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; - "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; - "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; - "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; - "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; - "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; - "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; - "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; - "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; - }."${version}"; + ${if is10 || is11 || is13 then "hash" else "sha256"} = + versions.srcHashForVersion version; }; inherit patches; @@ -428,10 +409,15 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ maintainers ; } // lib.optionalAttrs (!atLeast11) { - badPlatforms = if !is49 then [ "aarch64-darwin" ] else lib.platforms.darwin; + badPlatforms = if !(is48 || is49) then [ "aarch64-darwin" ] else lib.platforms.darwin; }; } // optionalAttrs is7 { env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; +} // lib.optionalAttrs (!atLeast10 && stdenv.hostPlatform.isDarwin) { + # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools. + preBuild = '' + makeFlagsArray+=('STRIP=${lib.getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip') + ''; } // optionalAttrs (!atLeast7) { env.langJava = langJava; } // optionalAttrs atLeast6 { diff --git a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch new file mode 100644 index 0000000000000..08dbfec6b249e --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch @@ -0,0 +1,21 @@ +diff -u a/libgcc/config.host b/libgcc/config.host +--- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500 ++++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500 +@@ -227,7 +227,7 @@ + tmake_file="$tmake_file t-slibgcc-darwin" + # newer toolsets produce warnings when building for unsupported versions. + case ${host} in +- *-*-darwin1[89]* | *-*-darwin2* ) ++ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*) + tmake_file="t-darwin-min-8 $tmake_file" + ;; + *-*-darwin9* | *-*-darwin1[0-7]*) +diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath +--- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500 ++++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500 +@@ -2,4 +2,4 @@ + SHLIB_RPATH = @rpath + + # Which does not work for Darwin < 9 +-HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5 ++SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path diff --git a/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch b/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch new file mode 100644 index 0000000000000..095713eb6c8c7 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch @@ -0,0 +1,16 @@ +diff -ur a/libgcc/config/t-darwin b/libgcc/config/t-darwin +--- a/libgcc/config/t-darwin 2012-07-14 09:50:59.000000000 -0400 ++++ b/libgcc/config/t-darwin 2023-11-05 21:26:11.696825584 -0500 +@@ -7,12 +7,6 @@ + crttme.o: $(srcdir)/config/darwin-crt-tm.c + $(crt_compile) $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) -DEND -c $< + +-# -pipe because there's an assembler bug, 4077127, which causes +-# it to not properly process the first # directive, causing temporary +-# file names to appear in stabs, causing the bootstrap to fail. Using -pipe +-# works around this by not having any temporary file names. +-HOST_LIBGCC2_CFLAGS += -pipe +- + # Use unwind-dw2-fde-darwin + LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/config/unwind-dw2-fde-darwin.c \ + $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c diff --git a/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch b/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch new file mode 100644 index 0000000000000..1ac870e572982 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch @@ -0,0 +1,96 @@ +Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982 + +diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h +--- a/gcc/config/darwin.h 2021-05-14 04:42:08.000000000 -0400 ++++ b/gcc/config/darwin.h 2023-11-06 08:53:27.629155053 -0500 +@@ -233,12 +233,18 @@ + + #define DSYMUTIL "\ndsymutil" + ++/* Spec that controls whether the debug linker is run automatically for ++ a link step. This needs to be done if there is a source file on the ++ command line which will result in a temporary object (and debug is ++ enabled). */ ++ + #define DSYMUTIL_SPEC \ + "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ + %{v} \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ ++ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\ ++ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" + + #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC + +@@ -469,18 +475,31 @@ + /* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf + debugging data. */ + ++#ifdef HAS_AS_STABS_DIRECTIVE ++/* We only pass a debug option to the assembler if that supports stabs, since ++ dwarf is not uniformly supported in the assemblers. */ + #define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}" ++#else ++#define ASM_DEBUG_SPEC "" ++#endif ++ ++#undef ASM_DEBUG_OPTION_SPEC ++#define ASM_DEBUG_OPTION_SPEC "" ++ + #define ASM_FINAL_SPEC \ + "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform } %<gsplit-dwarf" + +-/* We still allow output of STABS if the assembler supports it. */ ++/* We now require C++11 to bootstrap and newer tools than those based on ++ stabs, so require DWARF-2, even if stabs is supported by the assembler. */ ++ ++#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG ++#define DARWIN_PREFER_DWARF ++#define DWARF2_DEBUGGING_INFO 1 ++ + #ifdef HAVE_AS_STABS_DIRECTIVE + #define DBX_DEBUGGING_INFO 1 +-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + #endif + +-#define DWARF2_DEBUGGING_INFO 1 +- + #define DEBUG_FRAME_SECTION "__DWARF,__debug_frame,regular,debug" + #define DEBUG_INFO_SECTION "__DWARF,__debug_info,regular,debug" + #define DEBUG_ABBREV_SECTION "__DWARF,__debug_abbrev,regular,debug" +diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h +--- a/gcc/config/darwin9.h 2021-05-14 04:42:08.000000000 -0400 ++++ b/gcc/config/darwin9.h 2023-11-06 08:54:02.663945206 -0500 +@@ -18,29 +18,6 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +-/* Prefer DWARF2. */ +-#undef PREFERRED_DEBUGGING_TYPE +-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG +-#define DARWIN_PREFER_DWARF +- +-/* Since DWARF2 is default, conditions for running dsymutil are different. */ +-#undef DSYMUTIL_SPEC +-#define DSYMUTIL_SPEC \ +- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ +- %{v} \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" +- +-/* Tell collect2 to run dsymutil for us as necessary. */ +-#define COLLECT_RUN_DSYMUTIL 1 +- +-/* Only ask as for debug data if the debug style is stabs (since as doesn't +- yet generate dwarf.) */ +- +-#undef ASM_DEBUG_SPEC +-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}" +- + #undef ASM_OUTPUT_ALIGNED_COMMON + #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ + do { \ diff --git a/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch b/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch new file mode 100644 index 0000000000000..454139c5396c5 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch @@ -0,0 +1,99 @@ +Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982 + +diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h +--- a/gcc/config/darwin.h 2022-05-27 03:21:10.947379000 -0400 ++++ b/gcc/config/darwin.h 2023-11-06 12:18:27.209236423 -0500 +@@ -230,12 +230,18 @@ + + #define DSYMUTIL "\ndsymutil" + ++/* Spec that controls whether the debug linker is run automatically for ++ a link step. This needs to be done if there is a source file on the ++ command line which will result in a temporary object (and debug is ++ enabled). */ ++ + #define DSYMUTIL_SPEC \ + "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ + %{v} \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ ++ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\ ++ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" + + #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC + +@@ -463,21 +469,31 @@ + %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \ + %{static}" ASM_MMACOSX_VERSION_MIN_SPEC + +-/* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf +- debugging data. */ +- ++#ifdef HAS_AS_STABS_DIRECTIVE ++/* We only pass a debug option to the assembler if that supports stabs, since ++ dwarf is not uniformly supported in the assemblers. */ + #define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}" ++#else ++#define ASM_DEBUG_SPEC "" ++#endif ++ ++#undef ASM_DEBUG_OPTION_SPEC ++#define ASM_DEBUG_OPTION_SPEC "" ++ + #define ASM_FINAL_SPEC \ + "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf" + +-/* We still allow output of STABS if the assembler supports it. */ ++/* We now require C++11 to bootstrap and newer tools than those based on ++ stabs, so require DWARF-2, even if stabs is supported by the assembler. */ ++ ++#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG ++#define DARWIN_PREFER_DWARF ++#define DWARF2_DEBUGGING_INFO 1 ++ + #ifdef HAVE_AS_STABS_DIRECTIVE + #define DBX_DEBUGGING_INFO 1 +-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + #endif + +-#define DWARF2_DEBUGGING_INFO 1 +- + #define DEBUG_FRAME_SECTION "__DWARF,__debug_frame,regular,debug" + #define DEBUG_INFO_SECTION "__DWARF,__debug_info,regular,debug" + #define DEBUG_ABBREV_SECTION "__DWARF,__debug_abbrev,regular,debug" +diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h +--- a/gcc/config/darwin9.h 2022-05-27 03:21:10.947379000 -0400 ++++ b/gcc/config/darwin9.h 2023-11-06 12:18:48.325260590 -0500 +@@ -18,29 +18,6 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +-/* Prefer DWARF2. */ +-#undef PREFERRED_DEBUGGING_TYPE +-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG +-#define DARWIN_PREFER_DWARF +- +-/* Since DWARF2 is default, conditions for running dsymutil are different. */ +-#undef DSYMUTIL_SPEC +-#define DSYMUTIL_SPEC \ +- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ +- %{v} \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" +- +-/* Tell collect2 to run dsymutil for us as necessary. */ +-#define COLLECT_RUN_DSYMUTIL 1 +- +-/* Only ask as for debug data if the debug style is stabs (since as doesn't +- yet generate dwarf.) */ +- +-#undef ASM_DEBUG_SPEC +-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}" +- + #undef ASM_OUTPUT_ALIGNED_COMMON + #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ + do { \ diff --git a/pkgs/development/compilers/gcc/patches/clang-genconditions.patch b/pkgs/development/compilers/gcc/patches/clang-genconditions.patch new file mode 100644 index 0000000000000..655afd2abbc2c --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/clang-genconditions.patch @@ -0,0 +1,34 @@ +From https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92061#c5 + +--- a/gcc/genconditions.c 2019-01-01 12:37:19.064943662 +0100 ++++ b/gcc/genconditions.c 2019-10-11 10:57:11.464595789 +0200 +@@ -57,8 +57,9 @@ write_header (void) + \n\ + /* It is necessary, but not entirely safe, to include the headers below\n\ + in a generator program. As a defensive measure, don't do so when the\n\ +- table isn't going to have anything in it. */\n\ +-#if GCC_VERSION >= 3001\n\ ++ table isn't going to have anything in it.\n\ ++ Clang 9 is buggy and doesn't handle __builtin_constant_p correctly. */\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + \n\ + /* Do not allow checking to confuse the issue. */\n\ + #undef CHECKING_P\n\ +@@ -170,7 +171,7 @@ struct c_test\n\ + vary at run time. It works in 3.0.1 and later; 3.0 only when not\n\ + optimizing. */\n\ + \n\ +-#if GCC_VERSION >= 3001\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + static const struct c_test insn_conditions[] = {\n"); + + traverse_c_tests (write_one_condition, 0); +@@ -191,7 +192,7 @@ write_writer (void) + " unsigned int i;\n" + " const char *p;\n" + " puts (\"(define_conditions [\");\n" +- "#if GCC_VERSION >= 3001\n" ++ "#if GCC_VERSION >= 3001 && __clang_major__ < 9\n" + " for (i = 0; i < ARRAY_SIZE (insn_conditions); i++)\n" + " {\n" + " printf (\" (%d \\\"\", insn_conditions[i].value);\n" diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 0afc6586511a6..15880913bde1a 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -178,6 +178,9 @@ in # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 ++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch +# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. +++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch + # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] @@ -191,12 +194,19 @@ in sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; }) +# Fix undefined symbol errors when building older versions with clang +++ optional (!atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin) ./clang-genconditions.patch + ## gcc 9.0 and older ############################################################################## ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch +# Make Darwin bootstrap respect whether the assembler supports `--gstabs`, +# which is not supported by the clang integrated assembler used by default on Darwin. +++ optional (is9 && hostPlatform.isDarwin) ./9/gcc9-darwin-as-gstabs.patch + ## gcc 8.0 and older ############################################################################## @@ -204,6 +214,10 @@ in ++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch ++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch +# Make Darwin bootstrap respect whether the assembler supports `--gstabs`, +# which is not supported by the clang integrated assembler used by default on Darwin. +++ optional (is8 && hostPlatform.isDarwin) ./8/gcc8-darwin-as-gstabs.patch + ## gcc 7.0 and older ############################################################################## @@ -240,6 +254,12 @@ in ./6/gnat-glibc234.patch ] +# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input. +# Fortunately, it does not exhibit the problem GCC has with the cctools assembler. +# This patch can be dropped should darwin.cctools-llvm ever implement support. +++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch + + ## gcc 4.9 and older ############################################################################## ++ optional (!atLeast6) ./parallel-bconfig.patch diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix new file mode 100644 index 0000000000000..261ffc6345447 --- /dev/null +++ b/pkgs/development/compilers/gcc/versions.nix @@ -0,0 +1,38 @@ +let + majorMinorToVersionMap = { + "13" = "13.2.0"; + "12" = "12.3.0"; + "11" = "11.4.0"; + "10" = "10.5.0"; + "9" = "9.5.0"; + "8" = "8.5.0"; + "7" = "7.5.0"; + "6" = "6.5.0"; + "4.9"= "4.9.4"; + "4.8"= "4.8.5"; + }; + + fromMajorMinor = majorMinorVersion: + majorMinorToVersionMap."${majorMinorVersion}"; + + # TODO(amjoseph): convert older hashes to SRI form + srcHashForVersion = version: { + # NOTE: there is no need to remove hashes of obsolete minor + # versions when adding a new minor version. + "13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; + "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; + "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; + "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; + "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; + "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; + "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; + "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; + "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; + }."${version}"; + +in { + inherit fromMajorMinor; + inherit srcHashForVersion; + allMajorVersions = builtins.attrNames majorMinorToVersionMap; +} diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index ccd5d50aa75d2..d04e85777775e 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -212,6 +212,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 73ce0c9185744..f373d963ed285 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -210,6 +210,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index d3a57b6c9f0f9..909d090c17040 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; @@ -368,7 +369,9 @@ stdenv.mkDerivation rec { # Recache package db which needs to happen for Hadrian bindists # where we modify the package db before installing + '' - "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache + shopt -s nullglob + package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d) + "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; # In nixpkgs, musl based builds currently enable `pie` hardening by default diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index e876c4be0af71..d2d6dade497ed 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -150,7 +150,7 @@ # GHC's build system hadrian built from the GHC-to-build's source tree # using our bootstrap GHC. -, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian { +, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } { ghcSrc = ghcSrc; ghcVersion = version; userSettings = hadrianUserSettings; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 951b708381f10..6b8d657f34ec7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20230527"; - rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664"; - sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2"; + version = "9.9.20231014"; + rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695"; + sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9"; } diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 344c803419f60..bc2dfbda09f35 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -6,8 +6,8 @@ , pkg-config , openssl , Security -, libiconv , nix-update-script +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security libiconv ]; + lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI="; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index e608a25462ccc..834a30b371696 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -55,6 +55,6 @@ in stdenv.mkDerivation rec { homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index 1124c2ea98a4b..06002f4930ef0 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.10"; + version = "1.20.11"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ctL1GAXEcVAGbBA3VMdf3bLBnUjJIZ+jPR5GaWyEHbs="; + hash = "sha256-01XFrjqPd2PJ7J3CUVOq43OVjLy2DdCekai1bHYhsvw="; }; strictDeps = true; diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 1845a9c062b8e..f95bff23f6127 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -57,15 +57,15 @@ stdenv.mkDerivation (finalAttrs: { inherit arch platform hareflags; }; in - '' - runHook preConfigure + '' + runHook preConfigure - export HARECACHE="$NIX_BUILD_TOP/.harecache" - export BINOUT="$NIX_BUILD_TOP/.bin" - cat ${config-file} > config.mk + export HARECACHE="$NIX_BUILD_TOP/.harecache" + export BINOUT="$NIX_BUILD_TOP/.bin" + cat ${config-file} > config.mk - runHook postConfigure - ''; + runHook postConfigure + ''; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { qbe ]; in - '' - wrapProgram $out/bin/hare --prefix PATH : ${binPath} - ''; + '' + wrapProgram $out/bin/hare --prefix PATH : ${binPath} + ''; setupHook = ./setup-hook.sh; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A systems programming language designed to be simple, stable, and robust"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ onemoresuza ]; inherit (harec.meta) platforms badPlatforms; }; }) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix index 0def9fb193aca..6b71e0df0252a 100644 --- a/pkgs/development/compilers/hare/harec/default.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ onemoresuza ]; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ # UPDATE: https://github.com/hshq/harelang provides a MacOS port diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 4f6dddb3fa13f..b50f6287c971f 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.10"; + version = "1.9.20"; src = let getArch = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { getHash = arch: { "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; - "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; + "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; }.${arch}; in fetchurl { diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 81a7faf739050..152ee99fcb1c4 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -12,13 +12,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2023-08"; + version = "dev-2023-11"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-pmgrauhB5/JWBkwrAm7tCml9IYQhXyGXsNVDKTntA0M="; + hash = "sha256-5plcr+j9aFSaLfLQXbG4WD1GH6rE7D3uhlUbPaDEYf8="; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { description = "A fast, concise, readable, pragmatic and open sourced programming language"; homepage = "https://odin-lang.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ luc65r astavie ]; + maintainers = with maintainers; [ luc65r astavie znaniye ]; platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index d0766fe13768d..aadc72c174e28 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://www.softsynth.com/pforth/"; + homepage = "https://www.softsynth.com/pforth/"; description = "Portable Portable ANS-like Forth written in ANSI 'C'"; changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md"; license = lib.licenses.bsd0; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix deleted file mode 100644 index 5e5a0bee51fce..0000000000000 --- a/pkgs/development/compilers/sdcc/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null -, excludePorts ? [] }: - -let - # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 - excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]); -in - -stdenv.mkDerivation rec { - pname = "sdcc"; - version = "4.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; - }; - - enableParallelBuilding = true; - - buildInputs = [ boost gputils texinfo zlib ]; - - nativeBuildInputs = [ autoconf bison flex ]; - - configureFlags = map (f: "--disable-${f}-port") excludedPorts; - - preConfigure = '' - if test -n "''${dontStrip-}"; then - export STRIP=none - fi - ''; - - meta = with lib; { - description = "Small Device C Compiler"; - longDescription = '' - SDCC is a retargettable, optimizing ANSI - C compiler suite that targets - the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim - (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based - (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, - Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and - PIC18 targets. It can be retargeted for other microprocessors. - ''; - homepage = "https://sdcc.sourceforge.net/"; - license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; - maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index cae9a17ccca47..9fe0e42cb138d 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/pkgs/development/compilers/uasm/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://www.terraspace.co.uk/uasm.html"; + homepage = "https://www.terraspace.co.uk/uasm.html"; description = "A free MASM-compatible assembler based on JWasm"; platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 77c5c66891df6..2a8ea72b9f5b1 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "weekly.2023.42"; + version = "weekly.2023.44"; ptraceSubstitution = '' #include <sys/types.h> #include <sys/ptrace.h> @@ -9,12 +9,12 @@ let # Required for bootstrap. vc = stdenv.mkDerivation { pname = "v.c"; - version = "unstable-2023-10-17"; + version = "unstable-2023-10-30"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "bbfdece2ef5cab8a52b03c4df1ca0f803639069b"; - hash = "sha256-UdifiUDTivqJ94NJB25mF/xXeiEAE55QaIUwWwdAllQ="; + rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b"; + hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak="; }; # patch the ptrace reference for darwin @@ -30,8 +30,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "3a173bee57a48dcfc1c0177555e45116befac48e"; - hash = "sha256-TWiCUMzAzHidtzXEYtUQ7uuksW+EIjE/fZ+s2Mr+uWI="; + rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca"; + hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-sQ3M6tMufL560lvtWoa5f5MpOT4D8K5uq4kDPHNmUog="; + hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -111,7 +111,7 @@ stdenv.mkDerivation { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; + maintainers = with maintainers; [ Madouura delta231 ]; mainProgram = "v"; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 0ea755f7348b3..6d086d57b017f 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -69,15 +69,15 @@ let } // (yosys-symbiflow); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${pname}-${version}"; - hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; + rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; }; enableParallelBuilding = true; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." exit 1 fi ''; @@ -150,6 +150,6 @@ in stdenv.mkDerivation rec { homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ shell thoughtpolice emily ]; + maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; }; -} +}) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 1e31323f2e368..9ac4f1c383a9d 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -7,6 +7,7 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "4.9.0"; } { case = range "8.12" "8.17"; out = "4.8.0"; } { case = range "8.12" "8.16"; out = "4.6.0"; } { case = range "8.8" "8.16"; out = "4.5.2"; } @@ -14,6 +15,8 @@ mkCoqDerivation rec { { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.9.0".sha256 = "sha256-+5NppyQahcc1idGu/U3B+EIWuZz2L3/oY7dIJR6pitE="; + release."4.8.1".sha256 = "sha256-gknZ3bA90YY2AvwfFsP5iMhohwkQ8G96mH+4st2RPDc="; release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY="; release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ="; release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0="; diff --git a/pkgs/development/coq-modules/iris-named-props/default.nix b/pkgs/development/coq-modules/iris-named-props/default.nix new file mode 100644 index 0000000000000..c4d167750432b --- /dev/null +++ b/pkgs/development/coq-modules/iris-named-props/default.nix @@ -0,0 +1,17 @@ +{ lib, mkCoqDerivation, coq, version ? null, iris }: + +mkCoqDerivation rec { + pname = "iris-named-props"; + owner = "tchajed"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.16" "8.18"; out = "2023-08-14"; } + ] null; + release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; + release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc"; + propagatedBuildInputs = [ iris ]; + meta = { + description = "Named props for Iris"; + maintainers = with lib.maintainers; [ ineol ]; + }; +} diff --git a/pkgs/development/coq-modules/vcfloat/default.nix b/pkgs/development/coq-modules/vcfloat/default.nix index d5837812ae88a..5d1805c2573f5 100644 --- a/pkgs/development/coq-modules/vcfloat/default.nix +++ b/pkgs/development/coq-modules/vcfloat/default.nix @@ -4,6 +4,10 @@ with lib; mkCoqDerivation { pname = "vcfloat"; owner = "VeriNum"; inherit version; + sourceRoot = "source/vcfloat"; + postPatch = '' + coq_makefile -o Makefile -f _CoqProject *.v + ''; defaultVersion = with versions; switch coq.coq-version [ { case = range "8.16" "8.17"; out = "2.1.1"; } ] null; diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index fa3adc2fdf222..093e0ef195ca0 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; - maintainers = [ maintainers.fortuneteller2k ]; + maintainers = [ maintainers.bdd ]; }; }) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3fa9c44e7cd7c..d329664dddfad 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-08-15"; + version = "unstable-2023-11-02"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/0365d9b77086d26ca5197fb48019cedbb0dce5d2.tar.gz"; - sha256 = "15aia2v05cmblabhb287cf1yqy4dlzw0g905h79fcvkgygnn2ib8"; + url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz"; + sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61c2e51b7939e..723b8e5efba3c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,8 +20,8 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_18_0; @@ -39,8 +39,8 @@ self: super: { # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_1_0; - Cabal-syntax = cself.Cabal-syntax_3_10_1_0; + Cabal = cself.Cabal_3_10_2_0; + Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -57,15 +57,15 @@ self: super: { # 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_5; - hspec-discover = cself.hspec-discover_2_11_5; - hspec = cself.hspec_2_11_5; + hspec-core = cself.hspec-core_2_11_6; + hspec-discover = cself.hspec-discover_2_11_6; + hspec = cself.hspec_2_11_6; # 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_5 = dontCheck csuper.hspec-discover_2_11_5; + hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -154,16 +154,6 @@ self: super: { "vector-tests-O0" "vector-tests-O2" ]; - patches = [ - # Workaround almost guaranteed floating point errors in test suite with quickcheck 2.14.3 - # https://github.com/haskell/vector/issues/460 - (pkgs.fetchpatch { - name = "vector-quickcheck-2.14.3-float-workaround.patch"; - url = "https://github.com/haskell/vector/commit/df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c.patch"; - sha256 = "040wg8mqlkdnrl5axy9wk0mlpn8rpc4vc4afpxignj9i7yc4pfjj"; - stripLen = 1; - }) - ]; }) super.vector; # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3 @@ -194,11 +184,6 @@ self: super: { }) ] super.aeson); - # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6 - aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: { - th-abstraction = hfinal.th-abstraction_0_5_0_0; - }); - # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; @@ -207,9 +192,10 @@ self: super: { aeson-better-errors = doJailbreak super.aeson-better-errors; # 2023-08-09: Jailbreak because of vector < 0.13 - monad-bayes = doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_5; - }); + # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 + monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override { + hspec = self.hspec_2_11_6; + })); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 # https://github.com/haskell/statistics/issues/205 @@ -652,7 +638,6 @@ self: super: { saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server - sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; shake-language-c = dontCheck super.shake-language-c; @@ -1393,7 +1378,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); # Test suite requires database @@ -1438,13 +1423,20 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # 2022-09-20: We have overridden lsp to not be the stackage version. - # dhall-lsp-server needs the older 1.4.0.0 lsp - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = dontCheck (super.lsp_1_4_0_0.override { - lsp-types = super.lsp-types_1_4_0_1; - }); - }; + dhall-lsp-server = + # 2022-09-20: We have overridden lsp to not be the stackage version. + # dhall-lsp-server needs the older 1.4.0.0 lsp + let overridden-dhall-lsp-server = super.dhall-lsp-server.override { + lsp = dontCheck (super.lsp_1_4_0_0.override { + lsp-types = super.lsp-types_1_4_0_1; + }); + }; + in appendPatch (fetchpatch { + # This patch can be removed once the change question is in a tracked release. + url = "https://github.com/dhall-lang/dhall-haskell/pull/2539/commits/5dd0f0ba2d836fea3ef499c7aed04e83269c203f.patch"; + sha256 = "sha256-xjVuLDBptDGfTf7MVmPb0WuuFWRLpgDYX2ybbgjAjzs="; + relative = "dhall-lsp-server"; + }) overridden-dhall-lsp-server; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { @@ -1612,7 +1604,7 @@ self: super: { hspec-contrib = dontCheck super.hspec-contrib; # github.com/ucsd-progsys/liquidhaskell/issues/1729 - liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. @@ -1679,19 +1671,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - 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_2_11_6 = doDistribute (super.hspec_2_11_6.override { + hspec-discover = self.hspec-discover_2_11_6; + hspec-core = self.hspec-core_2_11_6; }); - hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override { + hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_5 = doDistribute (super.hspec-discover_2_11_5.override { - hspec-meta = self.hspec-meta_2_11_5; + hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { + hspec-meta = self.hspec-meta_2_11_6; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6 # is overlayed to hspec-core. - hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override { + hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; })); @@ -2123,7 +2115,7 @@ self: super: { # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); large-hashable = lib.pipe (super.large-hashable.override { @@ -2370,7 +2362,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 @@ -2684,4 +2676,13 @@ self: super: { # Too strict bounds on base kewar = doJailbreak super.kewar; + + # Tests rely on (missing) submodule + unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core; + + # Workaround for Cabal failing to find nonexistent SDL2 library?! + # https://github.com/NixOS/nixpkgs/issues/260863 + sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; + sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix new file mode 100644 index 0000000000000..99f48333323c6 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -0,0 +1,52 @@ +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +self: super: { + llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + + # Disable GHC core libraries + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + Cabal-syntax = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-experimental = null; + ghc-heap = null; + ghc-internal = null; + ghc-platform = null; + ghc-prim = null; + ghc-toolchain = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + semaphore-compat = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} 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 691f82c09616a..d13e4cfe9cfc9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -115,9 +115,9 @@ in { ( let hls_overlay = lself: lsuper: { - ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523; + ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231014; ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; - Cabal-syntax = lself.Cabal-syntax_3_10_1_0; + Cabal-syntax = lself.Cabal-syntax_3_10_2_0; }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { 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 f6ba21f37574a..24e722a9913eb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -65,21 +65,25 @@ self: super: { # Version deviations from Stackage LTS # - doctest = doDistribute super.doctest_0_22_1; + doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 some = doDistribute self.some_1_0_5; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; th-desugar = doDistribute self.th-desugar_1_15; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; 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; + base-compat = doDistribute self.base-compat_0_13_1; + base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; free = doJailbreak super.free; + # Because we bumped the version of base-compat above.^ + cabal-plan = unmarkBroken super.cabal-plan; + cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds; + # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6 file-io = unmarkBroken super.file-io; @@ -87,8 +91,8 @@ self: super: { # https://github.com/mokus0/th-extras/pull/21 th-extras = doJailbreak super.th-extras; - ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; + ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014; 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 @@ -196,8 +200,8 @@ self: super: { hw-prim = dontCheck (doJailbreak super.hw-prim); stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; - rebase = doJailbreak super.rebase_1_20; - rerebase = doJailbreak super.rerebase_1_20; + rebase = doJailbreak super.rebase_1_20_1_1; + rerebase = doJailbreak super.rerebase_1_20_1_1; hiedb = dontCheck super.hiedb; retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 @@ -268,7 +272,5 @@ self: super: { # the workaround on 9.6 is to revert to the LLVM backend (which is used # for these sorts of situations even on 9.2 and 9.4). # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 - tls = appendConfigureFlags - (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ]) - super.tls; + tls = if pkgs.stdenv.hostPlatform.isAarch64 then self.forceLlvmCodegenBackend super.tls else super.tls; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 4588933abc13a..cab81349733e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -1,10 +1,3 @@ -## -## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes: -## -## 1. "8.7" strings -## 2. llvm 6 -## 3. disabled library update: parallel -## { pkgs, haskellLib }: with haskellLib; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 206f397580904..5723167b408d0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -99,6 +99,8 @@ broken-packages: - affection # failure in job https://hydra.nixos.org/build/233213076 at 2023-09-02 - affine-invariant-ensemble-mcmc # failure in job https://hydra.nixos.org/build/233237176 at 2023-09-02 - Agata # failure in job https://hydra.nixos.org/build/233221026 at 2023-09-02 + - agda2hs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239252884 at 2023-11-10 + - agda2train # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239247619 at 2023-11-10 - Agda-executable # failure in job https://hydra.nixos.org/build/233332629 at 2023-09-02 - agda-language-server # failure in job https://hydra.nixos.org/build/233332694 at 2023-09-02 - agda-snippets # failure in job https://hydra.nixos.org/build/233332749 at 2023-09-02 @@ -1183,7 +1185,6 @@ broken-packages: - dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02 - dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02 - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02 - - dhall-lsp-server # failure in job https://hydra.nixos.org/build/233216852 at 2023-09-02 - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02 - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02 - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 @@ -1239,6 +1240,7 @@ broken-packages: - disjoint-set # failure in job https://hydra.nixos.org/build/233201934 at 2023-09-02 - disjoint-set-stateful # failure in job https://hydra.nixos.org/build/233253300 at 2023-09-02 - diskhash # failure in job https://hydra.nixos.org/build/233230362 at 2023-09-02 + - disposable # timeout - distance # failure in job https://hydra.nixos.org/build/233255082 at 2023-09-02 - Dist # failure in job https://hydra.nixos.org/build/233217811 at 2023-09-02 - distributed-closure # failure in job https://hydra.nixos.org/build/233223516 at 2023-09-02 @@ -1506,6 +1508,7 @@ broken-packages: - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02 - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02 - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 + - extensions # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239249292 at 2023-11-10 - 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 @@ -1624,6 +1627,7 @@ broken-packages: - flay # failure in job https://hydra.nixos.org/build/233235511 at 2023-09-02 - flexible-time # failure in job https://hydra.nixos.org/build/233208099 at 2023-09-02 - flickr # failure in job https://hydra.nixos.org/build/233212718 at 2023-09-02 + - Flint2 # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239246414 at 2023-11-10 - float-binstring # failure in job https://hydra.nixos.org/build/233203257 at 2023-09-02 - floating-bits # failure in job https://hydra.nixos.org/build/233223171 at 2023-09-02 - flock # failure in job https://hydra.nixos.org/build/233245164 at 2023-09-02 @@ -1733,7 +1737,6 @@ broken-packages: - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 - fusion # failure in job https://hydra.nixos.org/build/233204359 at 2023-09-02 - - futhark # failure in job https://hydra.nixos.org/build/236673091 at 2023-10-04 - futhask # failure in job https://hydra.nixos.org/build/233229281 at 2023-09-02 - futun # failure in job https://hydra.nixos.org/build/233245115 at 2023-09-02 - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02 @@ -1831,7 +1834,9 @@ broken-packages: - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02 - ghci-lib # failure in job https://hydra.nixos.org/build/233216644 at 2023-09-02 - ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02 + - ghcjs-base-stub # timeout - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 + - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 @@ -1852,12 +1857,13 @@ broken-packages: - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02 - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02 - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02 + - gi-adwaita # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239685049 at 2023-11-10 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - - gi-graphene # failure in job https://hydra.nixos.org/build/233205231 at 2023-09-02 + - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 @@ -1870,7 +1876,6 @@ broken-packages: - GiST # failure in job https://hydra.nixos.org/build/233199759 at 2023-09-02 - gist # failure in job https://hydra.nixos.org/build/233221381 at 2023-09-02 - git-all # failure in job https://hydra.nixos.org/build/233252935 at 2023-09-02 - - git-brunch # failure in job https://hydra.nixos.org/build/233250960 at 2023-09-02 - git-checklist # failure in job https://hydra.nixos.org/build/233203228 at 2023-09-02 - git-cuk # failure in job https://hydra.nixos.org/build/233211733 at 2023-09-02 - git-date # failure in job https://hydra.nixos.org/build/233259193 at 2023-09-02 @@ -2860,6 +2865,7 @@ broken-packages: - interruptible # failure in job https://hydra.nixos.org/build/233209873 at 2023-09-02 - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02 - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02 + - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10 - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02 - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02 - int-interval-map # failure in job https://hydra.nixos.org/build/233244556 at 2023-09-02 @@ -2928,6 +2934,7 @@ broken-packages: - java-adt # failure in job https://hydra.nixos.org/build/233256402 at 2023-09-02 - java-bridge # failure in job https://hydra.nixos.org/build/233219258 at 2023-09-02 - javascript-bridge # failure in job https://hydra.nixos.org/build/233217052 at 2023-09-02 + - javascript-extras # timeout - Javav # failure in job https://hydra.nixos.org/build/233243825 at 2023-09-02 - javav # failure in job https://hydra.nixos.org/build/233246644 at 2023-09-02 - jbi # failure in job https://hydra.nixos.org/build/233221466 at 2023-09-02 @@ -3025,6 +3032,7 @@ broken-packages: - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02 - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02 - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02 + - kdt # test failure in job https://hydra.nixos.org/build/239264029 at 2023-11-10 - keccak # failure in job https://hydra.nixos.org/build/233200469 at 2023-09-02 - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02 - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02 @@ -3587,6 +3595,7 @@ broken-packages: - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02 + - monus-weighted-search # timeout - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02 - morfette # failure in job https://hydra.nixos.org/build/233249575 at 2023-09-02 - morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02 @@ -3729,6 +3738,7 @@ broken-packages: - networked-game # failure in job https://hydra.nixos.org/build/233239577 at 2023-09-02 - network-house # failure in job https://hydra.nixos.org/build/233193957 at 2023-09-02 - network-manager-tui # failure in job https://hydra.nixos.org/build/233247972 at 2023-09-02 + - network-messagepack-rpc-websocket # timeout - network-metrics # failure in job https://hydra.nixos.org/build/233259963 at 2023-09-02 - network-msg # failure in job https://hydra.nixos.org/build/233236413 at 2023-09-02 - network-msgpack-rpc # failure in job https://hydra.nixos.org/build/233222467 at 2023-09-02 @@ -4700,6 +4710,7 @@ broken-packages: - ron # failure in job https://hydra.nixos.org/build/233197052 at 2023-09-02 - rope # failure in job https://hydra.nixos.org/build/233198109 at 2023-09-02 - rosebud # failure in job https://hydra.nixos.org/build/233225772 at 2023-09-02 + - rose-trees # timeout - rosmsg # failure in job https://hydra.nixos.org/build/233248569 at 2023-09-02 - rospkg # failure in job https://hydra.nixos.org/build/233229989 at 2023-09-02 - rosso # failure in job https://hydra.nixos.org/build/233230103 at 2023-09-02 @@ -4804,10 +4815,8 @@ broken-packages: - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - - sdl2-gfx # failure in job https://hydra.nixos.org/build/233236795 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 - seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02 @@ -4872,7 +4881,6 @@ broken-packages: - servant-http-streams # failure in job https://hydra.nixos.org/build/233242852 at 2023-09-02 - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02 - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02 - - servant-JuicyPixels # failure in job https://hydra.nixos.org/build/233222224 at 2023-09-02 - servant-kotlin # failure in job https://hydra.nixos.org/build/233598190 at 2023-09-02 - servant-namedargs # failure in job https://hydra.nixos.org/build/233258674 at 2023-09-02 - servant-nix # failure in job https://hydra.nixos.org/build/233236159 at 2023-09-02 @@ -5017,6 +5025,7 @@ broken-packages: - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 + - skews # timeout - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02 - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02 - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02 @@ -5371,6 +5380,7 @@ broken-packages: - tamarin-prover-utils # failure in job https://hydra.nixos.org/build/233235417 at 2023-09-02 - Tape # failure in job https://hydra.nixos.org/build/233191662 at 2023-09-02 - tapioca # failure in job https://hydra.nixos.org/build/233207781 at 2023-09-02 + - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-autocollect # failure in job https://hydra.nixos.org/build/233256957 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 @@ -5476,6 +5486,7 @@ broken-packages: - thank-you-stars # failure in job https://hydra.nixos.org/build/233219923 at 2023-09-02 - th-build # failure in job https://hydra.nixos.org/build/233224794 at 2023-09-02 - th-dict-discovery # failure in job https://hydra.nixos.org/build/233204140 at 2023-09-02 + - theatre-dev # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239251083 at 2023-11-10 - THEff # failure in job https://hydra.nixos.org/build/233221239 at 2023-09-02 - themoviedb # failure in job https://hydra.nixos.org/build/233233008 at 2023-09-02 - thentos-cookie-session # failure in job https://hydra.nixos.org/build/233234700 at 2023-09-02 @@ -5620,6 +5631,7 @@ broken-packages: - tremulous-query # failure in job https://hydra.nixos.org/build/233200947 at 2023-09-02 - TrendGraph # failure in job https://hydra.nixos.org/build/233258651 at 2023-09-02 - trhsx # failure in job https://hydra.nixos.org/build/233231297 at 2023-09-02 + - tries # timeout - trim # failure in job https://hydra.nixos.org/build/233195034 at 2023-09-02 - tripLL # failure in job https://hydra.nixos.org/build/233217806 at 2023-09-02 - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02 @@ -5744,7 +5756,6 @@ 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 @@ -6023,6 +6034,7 @@ broken-packages: - 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 + - wss-client # timeout - 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 @@ -6196,7 +6208,9 @@ broken-packages: - zeolite-lang # failure in job https://hydra.nixos.org/build/233217146 at 2023-09-02 - zero # failure in job https://hydra.nixos.org/build/233209286 at 2023-09-02 - zeromq3-haskell # failure in job https://hydra.nixos.org/build/233215557 at 2023-09-02 + - zeromq4-clone-pattern # timeout - zeromq4-conduit # failure in job https://hydra.nixos.org/build/233198244 at 2023-09-02 + - zeromq4-patterns # timeout - zeromq-haskell # failure in job https://hydra.nixos.org/build/233196050 at 2023-09-02 - zettelkast # failure in job https://hydra.nixos.org/build/233211485 at 2023-09-02 - ZFS # failure in job https://hydra.nixos.org/build/233257824 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 83a0821c054d2..703497e164078 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -94,12 +94,15 @@ extra-packages: - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib == 9.6.* # 2023-03-17: preserve for GHC 9.6 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser == 9.6.* # 2023-10-24: preserve for GHC 9.6 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser-ex == 9.6.* # 2023-10-24: preserve for GHC 9.6 - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x @@ -154,6 +157,8 @@ package-maintainers: - hnix-store-remote arturcygan: - hevm + athas: + - futhark berberman: - nvfetcher - arch-web @@ -169,6 +174,7 @@ package-maintainers: centromere: - nfc dalpd: + - dhall-lsp-server - espial - ghc-vis - patat @@ -208,6 +214,9 @@ package-maintainers: - vulkan-utils erictapen: - hakyll + evenbrenden: + - unleash-client-haskell + - unleash-client-haskell-core Gabriella439: - annah - bench @@ -279,8 +288,6 @@ package-maintainers: maralorn: - cabal-fmt - clay - - ema - - emanote - eventlog2html - generic-optics - ghc-debug-brick @@ -323,11 +330,12 @@ package-maintainers: ncfavier: - lambdabot nomeata: + - cabal-plan-bounds - candid - leb128-cereal - - tasty-expected-failure - lhs2tex - rec-def + - tasty-expected-failure peti: - cabal2spec - funcmp @@ -378,6 +386,11 @@ package-maintainers: - taffybar - arbtt - lentil + sheepforce: + - mpi-hs + - mpi-hs-store + - mpi-hs-cereal + - mpi-hs-binary shlok: - streamly-archive - streamly-lmdb diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e3444f9fbfca6..8be7c0fe44f32 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.14 +# Stackage LTS 21.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -117,7 +117,7 @@ default-package-overrides: - audacity ==0.0.2.1 - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.5 + - autodocodec ==0.2.1.0 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 @@ -148,8 +148,8 @@ default-package-overrides: - base-compat ==0.12.3 - base-compat-batteries ==0.12.3 - basement ==0.0.16 - - base-orphans ==0.9.0 - - base-prelude ==1.6.1 + - base-orphans ==0.9.1 + - base-prelude ==1.6.1.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - battleship-combinatorics ==0.0.1 @@ -182,7 +182,7 @@ default-package-overrides: - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - binary-orphans ==1.0.4.1 - - binary-parser ==0.5.7.3 + - binary-parser ==0.5.7.4 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -199,7 +199,7 @@ default-package-overrides: - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0 - Blammo ==1.1.2.1 - - blank-canvas ==0.7.3 + - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.3 @@ -248,7 +248,7 @@ default-package-overrides: - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - - bugzilla-redhat ==1.0.1 + - bugzilla-redhat ==1.0.1.1 - burrito ==2.0.1.6 - bv ==0.5 - byteable ==0.1.1 @@ -265,7 +265,7 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-lexing ==0.5.0.10 - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.6 + - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.10 - bytestring-trie ==0.2.7.2 @@ -365,9 +365,9 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.2.3 + - comfort-array ==0.5.3 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.0.1 + - comfort-blas ==0.0.1 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 @@ -391,7 +391,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.3 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.19 + - concurrent-output ==1.10.20 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -546,7 +546,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.3 + - deferred-folds ==0.9.18.5 - dejafu ==2.4.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -702,7 +702,7 @@ default-package-overrides: - errors-ext ==0.4.2 - ersatz ==0.4.13 - esqueleto ==3.5.10.3 - - event-list ==0.1.2 + - event-list ==0.1.2.1 - eventstore ==1.4.2 - every ==0.0.1 - evm-opcodes ==0.1.2 @@ -742,6 +742,7 @@ default-package-overrides: - fast-logger ==3.2.2 - fast-math ==1.0.2 - fastmemo ==0.1.1 + - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 - fcf-family ==0.2.0.0 - fdo-notify ==0.3.1 @@ -860,27 +861,27 @@ default-package-overrides: - genvalidity-case-insensitive ==0.0.0.1 - genvalidity-containers ==1.0.0.1 - genvalidity-criterion ==1.1.0.0 - - genvalidity-hspec ==1.0.0.2 + - genvalidity-hspec ==1.0.0.3 - genvalidity-hspec-aeson ==1.0.0.0 - genvalidity-hspec-binary ==1.0.0.0 - genvalidity-hspec-cereal ==1.0.0.0 - - genvalidity-hspec-hashable ==1.0.0.0 + - genvalidity-hspec-hashable ==1.0.0.1 - genvalidity-hspec-optics ==1.0.0.0 - genvalidity-hspec-persistent ==1.0.0.0 - - genvalidity-mergeful ==0.3.0.0 + - genvalidity-mergeful ==0.3.0.1 - genvalidity-mergeless ==0.3.0.0 - - genvalidity-persistent ==1.0.0.1 + - genvalidity-persistent ==1.0.0.2 - genvalidity-property ==1.0.0.0 - genvalidity-scientific ==1.0.0.0 - genvalidity-sydtest ==1.0.0.0 - genvalidity-sydtest-aeson ==1.0.0.0 - - genvalidity-sydtest-hashable ==1.0.0.0 + - genvalidity-sydtest-hashable ==1.0.0.1 - genvalidity-sydtest-lens ==1.0.0.0 - genvalidity-sydtest-persistent ==1.0.0.0 - genvalidity-text ==1.0.0.1 - genvalidity-time ==1.0.0.1 - genvalidity-typed-uuid ==0.1.0.1 - - genvalidity-unordered-containers ==1.0.0.0 + - genvalidity-unordered-containers ==1.0.0.1 - genvalidity-uuid ==1.0.0.1 - genvalidity-vector ==1.0.0.0 - geodetics ==0.1.2 @@ -900,11 +901,11 @@ default-package-overrides: - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.12 - ghc-syntax-highlighter ==0.0.9.0 - - ghc-tcplugins-extra ==0.4.4 + - ghc-tcplugins-extra ==0.4.5 - ghc-trace-events ==0.1.2.7 - - ghc-typelits-extra ==0.4.5 - - ghc-typelits-knownnat ==0.7.8 - - ghc-typelits-natnormalise ==0.7.8 + - ghc-typelits-extra ==0.4.6 + - ghc-typelits-knownnat ==0.7.9 + - ghc-typelits-natnormalise ==0.7.9 - ghc-typelits-presburger ==0.7.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.27 @@ -1069,7 +1070,7 @@ default-package-overrides: - hfsevents ==0.1.6 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.4.0 + - hi-file-parser ==0.1.5.0 - highlighting-kate ==0.6.4 - hindent ==6.0.0 - hinfo ==0.0.3.0 @@ -1282,7 +1283,7 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.2.1 + - indexed-traversable ==0.1.3 - indexed-traversable-instances ==0.1.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 @@ -1332,7 +1333,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.9 + - isomorphism-class ==0.1.0.10 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1361,7 +1362,7 @@ default-package-overrides: - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.5 - - kansas-comet ==0.4.1 + - kansas-comet ==0.4.2 - katip ==0.8.7.4 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.2 @@ -1375,11 +1376,11 @@ default-package-overrides: - keyed-vals-mem ==0.2.2.0 - keyed-vals-redis ==0.2.2.0 - keys ==3.12.3 - - ki ==1.0.1.0 + - ki ==1.0.1.1 - kind-apply ==0.4.0.0 - kind-generics ==0.5.0.0 - kind-generics-th ==0.2.3.3 - - ki-unlifted ==1.0.0.1 + - ki-unlifted ==1.0.0.2 - kleene ==0.1 - kmeans ==0.1.3 - knob ==0.2.2 @@ -1454,10 +1455,10 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.8.1 + - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.6 + - list-t ==1.0.5.7 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1548,9 +1549,9 @@ default-package-overrides: - microlens ==0.4.13.1 - microlens-aeson ==2.5.1 - microlens-contra ==0.1.0.3 - - microlens-ghc ==0.4.14.1 + - microlens-ghc ==0.4.14.2 - microlens-mtl ==0.2.0.3 - - microlens-platform ==0.4.3.3 + - microlens-platform ==0.4.3.4 - microlens-th ==0.4.3.14 - microspec ==0.2.1.3 - microstache ==1.0.2.3 @@ -1672,7 +1673,7 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.5.1.3 + - neat-interpolation ==0.5.1.4 - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 @@ -1687,7 +1688,7 @@ default-package-overrides: - netwire-input-glfw ==0.0.11 - network ==3.1.4.0 - network-bsd ==2.8.1.0 - - network-byte-order ==0.1.6 + - network-byte-order ==0.1.7 - network-conduit-tls ==1.3.2 - network-info ==0.2.1 - network-ip ==0.3.0.3 @@ -1711,11 +1712,11 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.5 - - non-empty ==0.3.4 + - non-empty ==0.3.5 - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.2.0 + - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 @@ -1852,8 +1853,8 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.4 - perfect-hash-generator ==1.0.0 - - persistent ==2.14.5.2 - - persistent-discover ==0.1.0.6 + - persistent ==2.14.6.0 + - persistent-discover ==0.1.0.7 - persistent-documentation ==0.1.0.4 - persistent-iproute ==0.2.5 - persistent-lens ==1.0.0 @@ -1862,10 +1863,10 @@ default-package-overrides: - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.13.6.1 - - persistent-qq ==2.12.0.5 + - persistent-qq ==2.12.0.6 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 - - persistent-sqlite ==2.13.1.1 + - persistent-sqlite ==2.13.2.0 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 @@ -1908,7 +1909,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.2 + - polysemy ==1.9.1.3 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.1 - polysemy-webserver ==0.2.1.2 @@ -1955,7 +1956,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.7 + - primitive-extras ==0.10.1.8 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 @@ -1997,7 +1998,7 @@ default-package-overrides: - PyF ==0.11.1.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.8 + - qrcode-core ==0.9.9 - qrcode-juicypixels ==0.8.5 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 @@ -2009,7 +2010,7 @@ default-package-overrides: - quickcheck-classes-base ==0.6.2.0 - quickcheck-groups ==0.0.0.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.29.1 + - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - quickcheck-monoid-subclasses ==0.1.0.0 - quickcheck-simple ==0.1.1.1 @@ -2097,7 +2098,7 @@ default-package-overrides: - rel8 ==1.4.1.0 - relapse ==1.0.0.1 - reliable-io ==0.0.2 - - relude ==1.2.0.0 + - relude ==1.2.1.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2136,7 +2137,7 @@ default-package-overrides: - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - - rrb-vector ==0.2.0.0 + - rrb-vector ==0.2.0.1 - RSA ==2.4.1 - rss ==3000.2.0.7 - rss-conduit ==0.6.0.1 @@ -2291,7 +2292,7 @@ default-package-overrides: - simple-vec3 ==0.6.0.1 - since ==0.0.0 - singleton-bool ==0.1.6 - - singleton-nats ==0.4.6 + - singleton-nats ==0.4.7 - singletons ==3.0.2 - singletons-base ==3.1.1 - singletons-presburger ==0.7.2.0 @@ -2338,7 +2339,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - splice ==0.6.1.1 - split ==0.2.3.5 - - splitmix ==0.1.0.4 + - splitmix ==0.1.0.5 - splitmix-distributions ==1.0.0 - split-record ==0.1.1.4 - Spock ==0.14.0.0 @@ -2378,7 +2379,7 @@ default-package-overrides: - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.11 + - stm-hamt ==1.2.0.13 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.7 - stm-split ==0.0.2.1 @@ -2387,10 +2388,10 @@ default-package-overrides: - storable-endian ==0.2.6.1 - storable-record ==0.0.7 - storable-tuple ==0.1 - - storablevector ==0.2.13.1 - - store ==0.7.16 - - store-core ==0.4.4.4 - - store-streaming ==0.2.0.3 + - storablevector ==0.2.13.2 + - store ==0.7.18 + - store-core ==0.4.4.6 + - store-streaming ==0.2.0.5 - stratosphere ==0.60.0 - Stream ==0.4.7.2 - streaming ==0.2.4.0 @@ -2438,28 +2439,28 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.7 - - swish ==0.10.6.0 + - swish ==0.10.7.0 - syb ==0.7.2.4 - - sydtest ==0.15.1.0 + - sydtest ==0.15.1.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 - - sydtest-discover ==0.0.0.3 + - sydtest-discover ==0.0.0.4 - sydtest-hedgehog ==0.4.0.0 - sydtest-hedis ==0.0.0.0 - sydtest-mongo ==0.0.0.0 - - sydtest-persistent ==0.0.0.1 - - sydtest-persistent-postgresql ==0.2.0.2 - - sydtest-persistent-sqlite ==0.2.0.2 + - sydtest-persistent ==0.0.0.2 + - sydtest-persistent-postgresql ==0.2.0.3 + - sydtest-persistent-sqlite ==0.2.0.3 - sydtest-process ==0.0.0.0 - sydtest-rabbitmq ==0.1.0.0 - sydtest-servant ==0.2.0.2 - sydtest-typed-process ==0.0.0.0 - - sydtest-wai ==0.2.0.0 + - sydtest-wai ==0.2.0.1 - sydtest-webdriver ==0.0.0.1 - - sydtest-webdriver-screenshot ==0.0.0.1 + - sydtest-webdriver-screenshot ==0.0.0.2 - sydtest-webdriver-yesod ==0.0.0.1 - - sydtest-yesod ==0.3.0.1 + - sydtest-yesod ==0.3.0.2 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2552,7 +2553,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.3 + - text-icu ==0.8.0.4 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2564,7 +2565,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10.4 - - text-show-instances ==3.9.6 + - text-show-instances ==3.9.7 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2667,7 +2668,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.9 - - typed-process ==0.2.11.0 + - typed-process ==0.2.11.1 - typed-uuid ==0.2.0.0 - type-equality ==1 - type-errors ==0.2.0.2 @@ -2748,12 +2749,12 @@ default-package-overrides: - utf8-string ==1.0.2 - utility-ht ==0.0.17 - uuid ==1.3.15 - - uuid-types ==1.0.5 + - uuid-types ==1.0.5.1 - valida ==1.1.0 - valida-base ==0.2.0 - validate-input ==0.5.0.0 - validationt ==0.3.0 - - validity ==0.12.0.1 + - validity ==0.12.0.2 - validity-aeson ==0.2.0.5 - validity-bytestring ==0.4.1.1 - validity-case-insensitive ==0.0.0.0 @@ -2771,7 +2772,7 @@ default-package-overrides: - vault ==0.3.1.5 - vcs-ignore ==0.0.2.0 - vec ==0.5 - - vector ==0.13.0.0 + - vector ==0.13.1.0 - vector-algorithms ==0.9.0.1 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 @@ -2788,7 +2789,7 @@ default-package-overrides: - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==6.0.1 + - versions ==6.0.2 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2917,7 +2918,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.17 - - Yampa ==0.14.4 + - Yampa ==0.14.5 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 136aed746efb8..9eaabf6c8a137 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,7 +22,6 @@ dont-distribute-packages: - Advise-me - AlgoRhythm - AlignmentAlgorithms - - Allure - AndroidViewHierarchyImporter - Annotations - ApplePush @@ -254,7 +253,6 @@ dont-distribute-packages: - LDAPv3 - LPFP - LPPaver - - LambdaHack - LambdaINet - LambdaPrettyQuote - LambdaShell @@ -1486,9 +1484,11 @@ dont-distribute-packages: - ghc-dump-util - ghc-imported-from - ghc-instances + - ghc-lib_9_8_1_20231009 - ghc-mod - ghc-plugs-out - ghc-session + - ghc_9_8_1 - ghci-pretty - ghcide-bench - ghcjs-dom-hello @@ -1498,7 +1498,6 @@ dont-distribute-packages: - ght - gi-cairo-again - gi-ges - - gi-gsk - gi-gstpbutils - gi-gtk-declarative-app-simple - gi-gtk_4_0_8 @@ -1727,8 +1726,6 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters - - google-maps-geocoding - - google-static-maps - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -1894,7 +1891,6 @@ dont-distribute-packages: - haskell-pdf-presenter - haskell-platform-test - haskell-reflect - - haskell-snake - haskell-src-exts-observe - haskell-token-utils - haskell-tools-ast @@ -2035,7 +2031,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner - - hetzner_0_4_0_1 + - hetzner_0_5_0_0 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2547,6 +2543,7 @@ dont-distribute-packages: - liquid-prelude - liquid-vector - liquidhaskell + - liquidhaskell-boot - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser @@ -3569,7 +3566,6 @@ dont-distribute-packages: - shady-gen - shady-graphics - shake-bindist - - shake-futhark - shake-minify-css - shakebook - shaker diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 89a268a09a6ed..037019be4de31 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1342,4 +1342,24 @@ self: super: builtins.intersectAttrs super { gi-webkit2 gi-webkit2webextension ; + + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. + # Also adds required test dependencies for checks to pass + mpi-hs = + let validMpi = [ "openmpi" "mpich" "mvapich" ]; + mpiImpl = pkgs.mpi.pname; + disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); + in lib.pipe + (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] + ++ disableUnused + ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) + ); + inherit (lib.mapAttrs (_: addTestToolDepends + [ pkgs.openssh pkgs.mpiCheckPhaseHook ] + ) super) + mpi-hs-store + mpi-hs-cereal + mpi-hs-binary + ; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f46ce422cc7f4..005dfd53a42e1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,39 +811,39 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, case-insensitive + ({ mkDerivation, aeson, alex, ansi-terminal, array, async, base + , binary, blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, dlist, edit-distance , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev , happy, hashable, haskeline, monad-control, mtl, murmur-hash - , parallel, pretty, process, regex-tdfa, split, stm, STMonadTrans - , strict, text, time, time-compat, transformers + , parallel, peano, pretty, process, regex-tdfa, split, stm + , STMonadTrans, strict, text, time, time-compat, transformers , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.3"; - sha256 = "05k0insn1c2dbpddl1slcdn972j8vgkzzy870yxl43j75j0ckb5y"; - revision = "4"; - editedCabalFile = "1xfhn4ap5h5aj9vp9m474p98jz7g4azf5m7ngwbj7ivhgnkl32wh"; + version = "2.6.4"; + sha256 = "0jzgynv737f4lwamyx1lihrabib0qcaik3cs5zrxryjpj5qvqb2v"; + revision = "1"; + editedCabalFile = "1n3w7ajswgafyjzc8ym1dqpmralnsaj3923qxvs4n0xdc6rc72r9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - case-insensitive containers data-hash deepseq directory dlist - edit-distance equivalence exceptions filepath ghc-compact gitrev - hashable haskeline monad-control mtl murmur-hash parallel pretty - process regex-tdfa split stm STMonadTrans strict text time - time-compat transformers unordered-containers uri-encode vector - vector-hashtables zlib + aeson ansi-terminal array async base binary blaze-html boxes + bytestring case-insensitive containers data-hash deepseq directory + dlist edit-distance equivalence exceptions filepath ghc-compact + gitrev hashable haskeline monad-control mtl murmur-hash parallel + peano pretty process regex-tdfa split stm STMonadTrans strict text + time time-compat transformers unordered-containers uri-encode + vector vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.abbradar lib.maintainers.iblech lib.maintainers.turion @@ -867,15 +867,17 @@ self: { }) {}; "AhoCorasick" = callPackage - ({ mkDerivation, array, base, hashable, mtl, unordered-containers + ({ mkDerivation, array, base, containers, hashable, mtl, tasty + , tasty-hunit, unordered-containers }: mkDerivation { pname = "AhoCorasick"; - version = "0.0.3"; - sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza"; + version = "0.0.4"; + sha256 = "12ddmnmlf46g23j31q0rgh67bh0brjb6p5iax5qi78n39c0pwlz5"; libraryHaskellDepends = [ array base hashable mtl unordered-containers ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Aho-Corasick string matching algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -994,7 +996,6 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Allure"; }) {}; @@ -1173,8 +1174,8 @@ self: { }: mkDerivation { pname = "AsyncRattus"; - version = "0.1"; - sha256 = "0ppij9i4nv26dkc9gb5b669bvb3wipx1a5kam23cx5gia60k45s1"; + version = "0.1.0.1"; + sha256 = "0q1ly8452dyyhgfy94k122mrk6v9wwzmszfp41rs8asqfvlj905f"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc hashtables simple-affine-space transformers @@ -2108,6 +2109,8 @@ self: { pname = "Blammo"; version = "1.1.2.1"; sha256 = "0j71glqsvzrmvj5ag32n48ib8wyyasjw0vdz2g93l2g2zhmsyz8y"; + revision = "1"; + editedCabalFile = "12kfvkvc78d386w4v8wdhwb3xd6470cnpqsaxd5kwldvvaz5hznj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2850,15 +2853,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_1_0" = callPackage + "Cabal_3_10_2_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.1.0"; - sha256 = "1vlqrh75s1n82ymd7yxbmy9py1n35fvdhw7hn1ph2y1i9j7apnqb"; + version = "3.10.2.0"; + sha256 = "0nsnf14ja30vhsqf2scaqb1a4wjr8491i83nxi4r9m47m40yw8sc"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2929,15 +2932,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_10_1_0" = callPackage + "Cabal-syntax_3_10_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers, unix }: mkDerivation { pname = "Cabal-syntax"; - version = "3.10.1.0"; - sha256 = "08pmafs761bk892s2arf8s17wswhxr8ar642vsh6hxrjalihk01v"; + version = "3.10.2.0"; + sha256 = "0j2j4r93rjidrgfjgwfm25l369yq3zklcqvgq4891k9ik98irkvs"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3110,8 +3113,8 @@ self: { pname = "Chart"; version = "1.9.4"; sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; - revision = "1"; - editedCabalFile = "0l9irzb4zq5jhgl1rvwgxz6rrzxjndj4arjv7adlzs5zl43iazqr"; + revision = "3"; + editedCabalFile = "0yppwi2cqy46dzasbdvq2120m8zrak1lj1qhlv5x7dzbdrji0529"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -6291,8 +6294,8 @@ self: { }: mkDerivation { pname = "FiniteCategories"; - version = "0.3.0.1"; - sha256 = "0jsggzvdxx7v02inl68fc3x86xrbsn2407hnfqy5c9rkiiqx7w94"; + version = "0.5.0.0"; + sha256 = "022cli3n96389dkcff85kbg95a2v4zmr66pmv36g1pjxvgsr6ffn"; libraryHaskellDepends = [ base containers directory filepath random text WeakSets ]; @@ -6310,8 +6313,8 @@ self: { }: mkDerivation { pname = "FiniteCategoriesGraphViz"; - version = "0.1.0.0"; - sha256 = "07ssar4sv8wma7imgc9mnx77c4kd9n9bqr87f1d5aqxvv2a62np0"; + version = "0.2.0.0"; + sha256 = "1ff4mqbqlpki959d9qcq6h91v4p93iq4llac47kgzv98mcwvy146"; libraryHaskellDepends = [ base containers directory fgl filepath FiniteCategories graphviz process random text WeakSets @@ -6373,6 +6376,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "Flint2" = callPackage + ({ mkDerivation, base, flint, gmp, groups, QuickCheck }: + mkDerivation { + pname = "Flint2"; + version = "0.1.0.1"; + sha256 = "1jw0x82mgqy4pxwxpyv0crz7n72kv255iq4pxr8c5xkvsw6w2w5i"; + libraryHaskellDepends = [ base groups QuickCheck ]; + librarySystemDepends = [ flint gmp ]; + libraryPkgconfigDepends = [ flint gmp ]; + testHaskellDepends = [ base ]; + description = "Haskell bindings for the flint library for number theory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) flint; inherit (pkgs) gmp;}; + "Flippi" = callPackage ({ mkDerivation, base, cgi, containers, directory, haskell98 , old-time, parsec, xhtml @@ -9797,8 +9816,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; - revision = "2"; - editedCabalFile = "1bpq8xjyrgcxs6yf6wh7ada2xrln1dqi02b5ilj8gwn1p30hq8nr"; + revision = "3"; + editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -10170,6 +10189,8 @@ self: { pname = "HaXml"; version = "1.25.13"; sha256 = "0wxkp9bnbnjrjrzsmpm6nknzn0ijiiajd5kms81kgyfypm4m91ax"; + revision = "1"; + editedCabalFile = "0rj3d04yw276hwbw09x2ydm5pmkfmm917cc540bwi9x108ksbr1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11371,6 +11392,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "HsYAML_0_2_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.1.3"; + sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl , scientific, text, unordered-containers, vector @@ -11379,8 +11422,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "9"; - editedCabalFile = "1rfaj175vh635s8csm6pazrvwwaw8gg3axi2cchpafw5pb9n5xg8"; + revision = "10"; + editedCabalFile = "1x99nqpd037a5p0lqk6qn9cmdafgcajk4gnvxd5dw5gdpyq85x3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12906,7 +12949,6 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "LambdaHack"; }) {}; @@ -13285,10 +13327,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.8.1"; - sha256 = "10i1ynfhafnmiw0ka9w0v05y5dcdcifsh0kx5f8py1k5ax1ha4by"; - revision = "2"; - editedCabalFile = "0bdj0m0wjxzkrhdjdmaazgh7hwgvdjmnjsawyn83pjl6l36ygmxh"; + version = "4.7.8.2"; + sha256 = "1m7rmz8qkyb6c2mag4p39gw9cjhw7xdsshvb7vik8694l3qplqxd"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14328,8 +14368,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "3"; - editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz"; + revision = "4"; + editedCabalFile = "0hz8l2yx9p5qwis7lxsnk7n3zss00hw3rxphhj6ih56ppjv7d6h3"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -16168,6 +16208,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; + revision = "1"; + editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17258,12 +17300,14 @@ self: { }) {}; "QuickCheck-GenT" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, random }: + ({ mkDerivation, base, mmorph, QuickCheck, random, transformers }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.2.2"; - sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz"; - libraryHaskellDepends = [ base mtl QuickCheck random ]; + version = "0.2.2.1"; + sha256 = "16kn7l98h7px3644gjc24a8pgisy1gr3w5k4gzw71dp6msqcbnqh"; + libraryHaskellDepends = [ + base mmorph QuickCheck random transformers + ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; }) {}; @@ -17841,6 +17885,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "Rattus_0_5_1_1" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space + , transformers + }: + mkDerivation { + pname = "Rattus"; + version = "0.5.1.1"; + sha256 = "171ssph6mx12cfc1wx63qn41s7w7fsv686kr6zchd2dg6pwn60gz"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "A modal FRP language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -21844,8 +21906,8 @@ self: { }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.5"; - sha256 = "1brqn6zx4ynljc424dpwrxj5fjmvl0mgp7wycnzpfxpfmwwqib4a"; + version = "0.11.0.1"; + sha256 = "0v8grsc28sni1mapnr56mvmg956q8nw6qqkdfwwhksyykfz6w9fm"; libraryHaskellDepends = [ base bytestring system-cxx-std-lib transformers vector vulkan ]; @@ -22038,8 +22100,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.4.0.1"; - sha256 = "0lv7vwj3vl8i18w2l0jkv6i3l9ihpy7lrxd84s666fspx6fxkdp9"; + version = "1.5.0.0"; + sha256 = "1h6n8z1f097rgzymx4ivqbkwiv7c9ignkpbybp342rw3k6cd7rk3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -22902,8 +22964,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.4"; - sha256 = "1lj1fj77ajckxhv9avx22djyl4jp44693y54j6hyx0xfp4dafhr5"; + version = "0.14.5"; + sha256 = "1pr9g5rhxx9v54f4d0cjwy9yr6wd32ssi23wms8kmf9avjbi0gms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25631,7 +25693,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_0_0" = callPackage + "aeson_2_2_1_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist , exceptions, filepath, generic-deriving, generically, ghc-prim @@ -25645,15 +25707,17 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.0.0"; - sha256 = "0z1f65iv0sigiqmm4vwbj3bzmn0ka0m56nkalhv2h5r9jc0y4rfx"; + version = "2.2.1.0"; + sha256 = "0zsxkb7lizn1c1a5q4jzg4wyxb17njx2rahxf9fdn4hdx38fykli"; + revision = "1"; + editedCabalFile = "1jrny4i1hc335yz5vc2r1nx1lnpy5q5jqqg1fc2y2cw2vam62fm2"; libraryHaskellDepends = [ base bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable - integer-conversion network-uri OneTuple primitive QuickCheck - scientific semialign strict tagged template-haskell text - text-iso8601 text-short th-abstraction these time time-compat - unordered-containers uuid-types vector witherable + integer-conversion integer-logarithms network-uri OneTuple + primitive QuickCheck scientific semialign strict tagged + template-haskell text text-iso8601 text-short th-abstraction these + time time-compat unordered-containers uuid-types vector witherable ]; testHaskellDepends = [ base base-compat base-orphans base16-bytestring bytestring @@ -26635,6 +26699,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-unqualified-ast" = callPackage + ({ mkDerivation, aeson, base, scientific, text, vector }: + mkDerivation { + pname = "aeson-unqualified-ast"; + version = "1.0.0.3"; + sha256 = "09a0mj7cwwh9jppg8a9n69zq86gma3ssqzxjwfy1nqwqa0sa1dd2"; + libraryHaskellDepends = [ aeson base scientific text vector ]; + description = "Aliases to \"aeson\" AST making it importable unqualified"; + license = lib.licenses.mit; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -27014,7 +27089,9 @@ self: { ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "agda2hs"; + broken = true; }) {}; "agda2lagda" = callPackage @@ -27037,6 +27114,32 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2train" = callPackage + ({ mkDerivation, aeson, aeson-pretty, Agda, async, base, bytestring + , containers, deepseq, directory, file-embed, filepath, mtl, pretty + , unordered-containers + }: + mkDerivation { + pname = "agda2train"; + version = "0.0.3.0"; + sha256 = "0kc49cwkdj7fgfbi4nwwdk675bnnw2zqj09snlczm3yc0357gkfa"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson Agda async base containers file-embed mtl pretty + ]; + executableHaskellDepends = [ + aeson aeson-pretty Agda async base bytestring containers deepseq + directory file-embed filepath mtl pretty unordered-containers + ]; + doHaddock = false; + description = "Agda backend to generate training data for machine learning purposes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "agda2train"; + broken = true; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27271,8 +27374,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.9.1"; - sha256 = "15l6lgzl64ym21rzf6dbp927bj0s23kx9rp2z34k36ghy4sbdqjz"; + version = "6.0.0"; + sha256 = "1pqib3g333zhzpra22qxilwbw6v54dnzciqwi5668rhwnv66a8h4"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27287,8 +27390,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.3.2"; - sha256 = "1bd85lk70h6p4a1v0h8dhbnsx5sc8cyj916kaq1hn6r0ykkrnsjd"; + version = "0.4"; + sha256 = "0civg85a1rv3n2400fi9hi30zb1l1sycxjccxxmkd8kk4izcjxkz"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl mwc-random random ]; @@ -27320,8 +27423,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.3.3"; - sha256 = "0ps0spjd7himcfgr9ahh27c24isdvxrihf4qv2sr7cs33n6h7hsj"; + version = "5.4.0"; + sha256 = "1b4izqmafs1biak33fgz5pr8xcjsr35g19r9d3y6sznjcc48d58b"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -27336,8 +27439,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "5.1"; - sha256 = "0ya9zl73zjq6xnr5b6a15jcw9dvsjhlj2xz0xlc402v96siwb690"; + version = "5.4.1"; + sha256 = "1jg6cb4c4njw0n4kzx6ghdhd3zmza0h2vvzsi1w7jy2rzipzc1bm"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo colour lens @@ -27353,8 +27456,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.3"; - sha256 = "10m85nx1jdvv3vyg6rmpjiajpch4pnyamh3vxw6b4dwn140zlqq8"; + version = "5.4.1"; + sha256 = "1mcyiz9b91zbsy098h5192j047rnws1hkqg59dnhk2dwg4kvapmn"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -27369,8 +27472,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "5.1"; - sha256 = "13vgcm5dmqml9751wylvshxvgx8bgki2ymfp87l1llrp8qfxy95j"; + version = "5.4.1"; + sha256 = "1g7xw4yc0bpgigq3zy1s7cw3kp6x4y9hplm23gwzf7kf5b0c8ivx"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams colour containers filepath lens @@ -27385,8 +27488,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.6.2"; - sha256 = "09dfb212jjyd4fwqbl1bmm5k2sndzpx47vw688vgnx37zd94jwwj"; + version = "0.7.1"; + sha256 = "140v910ivhryb5jan6an083xcjcghgdyqary0qyi4isjiikahlpq"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -27403,8 +27506,8 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.6.2"; - sha256 = "0misn0pkrkfyyzg859y57ida2xc9ibmz5ykizj1fw30zsby57skl"; + version = "0.7"; + sha256 = "19zmzl8irs779m2g7284114fdk1z99kq6fnbw1cb2zwj3xl0212r"; libraryHaskellDepends = [ aivika aivika-transformers array base containers mtl mwc-random random @@ -27419,8 +27522,8 @@ self: { }: mkDerivation { pname = "aivika-realtime"; - version = "0.3.1"; - sha256 = "0wvv41ip4izwa22l7p6zz1sdr8vchlakvm5vka33r5gkq10fw6s9"; + version = "0.4"; + sha256 = "1v02fmcp271w3zbq68nzjlqhs2yn9v4ks6vcanjrcc9mrkfwz0m6"; libraryHaskellDepends = [ aivika aivika-transformers async base containers mtl mwc-random random stm time vector @@ -27435,8 +27538,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.9.1"; - sha256 = "0ii7g6a29fksg3lrk6vvlhaafdjssqypz92spksnpgjfv7iamk99"; + version = "6.0.0"; + sha256 = "1fr6zrf401sg5a8w3k0fman4d6qg9cfy9j1vsw58l5z609ma79jx"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -28176,8 +28279,8 @@ self: { ({ mkDerivation, assoc, base, bifunctors, lens, semigroupoids }: mkDerivation { pname = "alignment"; - version = "0.1.0.3"; - sha256 = "09icpp5s8sfygcq423mczmapn0ssc9s9i9v5cr78bf687wqy7yqv"; + version = "0.1.0.4"; + sha256 = "0579myc2fr0ksbsykyl6bw2v204vmvmkyc4phgm8dnmh921zchpz"; libraryHaskellDepends = [ assoc base bifunctors lens semigroupoids ]; @@ -32781,6 +32884,8 @@ self: { pname = "amazonka-mtl"; version = "0.1.1.0"; sha256 = "0r7fmffqj3yl6vwidfny4s2ynhkfx9h0di6l7pm79j5m5fp5vdvr"; + revision = "1"; + editedCabalFile = "1hsrc72v7qqbpzi5pqbjb8ysrhiiydk7fi6i9078nf8f1jammd4h"; libraryHaskellDepends = [ amazonka amazonka-core base conduit lens mtl resourcet unliftio-core @@ -36586,16 +36691,13 @@ self: { }) {}; "apecs-physics" = callPackage - ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + ({ mkDerivation, apecs, base, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.5"; - sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; - revision = "1"; - editedCabalFile = "0kzg82azksva8l13548qk4bkx5ww1z0ca1bv141gp4fr0vamw446"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.6"; + sha256 = "14x26x6c747fh1yrl50g0pwcirbk7r7qxvy48h8y8zrm0n158n5c"; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector ]; @@ -37352,8 +37454,8 @@ self: { }: mkDerivation { pname = "appendful-persistent"; - version = "0.1.0.0"; - sha256 = "0aw463j5qyjazzj7w325fn85nyz3i7rml1c5f02ps06n9rhw0w1k"; + version = "0.1.0.1"; + sha256 = "02l78jqyc20q1i4d1b83ds63pd2nl189wg29zbvwryjcajr8ci3f"; libraryHaskellDepends = [ appendful base containers microlens persistent ]; @@ -38050,8 +38152,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; - revision = "2"; - editedCabalFile = "17y3c5rk3bylmnm63x06a50wa5r38wbm18gq3w5mbf6pfqfimkj5"; + revision = "3"; + editedCabalFile = "1924crg373xid7pxcpi178njmiiaq1m8cf59y96zjhaw4z07054q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38085,6 +38187,8 @@ self: { pname = "arch-web"; version = "0.2"; sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; + revision = "1"; + editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -38689,8 +38793,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; - revision = "1"; - editedCabalFile = "0vpldqnwzanpn8bavcarlzbajx57j43ddfm91jl3qbi32x4mbzja"; + revision = "2"; + editedCabalFile = "0fxzpwvn8n2sfnjl6qqsh556sjyng4gw2ddfbvhzf346xb3nrnzv"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -40186,8 +40290,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "3"; - editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6"; + revision = "4"; + editedCabalFile = "0bax7cvg85jhg7n1rl2mdj90j4qn27ssaprkw7wr1r0lw3yfx34v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -41117,8 +41221,8 @@ self: { pname = "attoparsec"; version = "0.14.4"; sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; - revision = "4"; - editedCabalFile = "07sqs9rnxyjgrz22nxsx9xwj5hkljnyw8bqcbb75kbqi6c9ky6ba"; + revision = "5"; + editedCabalFile = "1bmih9b4b3vdad8mpwy6k15ay2k8zbxl0z5x40b47ml1p0wraw7c"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -41149,14 +41253,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "attoparsec-aeson_2_2_0_0" = callPackage + "attoparsec-aeson_2_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , integer-conversion, primitive, scientific, text, vector }: mkDerivation { pname = "attoparsec-aeson"; - version = "2.2.0.0"; - sha256 = "1r228cpyd27658csc5pabbwjwf1q5q93a3f1fkymjh4ib4rzw27s"; + version = "2.2.0.1"; + sha256 = "02f406d5jh038qn8cccr0fbxkczhgzplmnfb448hrl25gcxg5ifg"; libraryHaskellDepends = [ aeson attoparsec base bytestring integer-conversion primitive scientific text vector @@ -41325,6 +41429,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-iso8601_1_1_0_1" = callPackage + ({ mkDerivation, attoparsec, base, integer-conversion, text, time + , time-compat + }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.1.0.1"; + sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; + libraryHaskellDepends = [ + attoparsec base integer-conversion text time time-compat + ]; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -41839,8 +41959,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.5"; - sha256 = "0wk84rnxdy6wh8953yx2gfn4kfpranv42w1hs13gxmrg0b2n3pjy"; + version = "0.2.1.0"; + sha256 = "0i65xldrrygy7y64y2s47fwm1n87zr753q777ii7gd2qs8hqx1wy"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -42569,6 +42689,8 @@ self: { pname = "aws-arn"; version = "0.3.1.0"; sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; + revision = "1"; + editedCabalFile = "029q777z4pd0vnj9c4v1ivzjb7azj6aq8gb55bwidw21lq55p98r"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -43299,6 +43421,8 @@ self: { pname = "aws-sns-verify"; version = "0.0.0.3"; sha256 = "1l6w3am550ls656s9hnjib6zj0g6471brsj4vn9c7i03qqwgdgmy"; + revision = "1"; + editedCabalFile = "1azc52s8akmf7kvlvxmnxkcbn5fhca9za5kzzypjanfj2ysdjpzr"; libraryHaskellDepends = [ aeson base bytestring crypton-x509 crypton-x509-validation errors http-conduit memory network-uri pem regex-tdfa text @@ -44249,6 +44373,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "barbies_2_0_5_0" = callPackage + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "barbies"; + version = "2.0.5.0"; + sha256 = "1j8c45k1x9vi9w44qnc8nyy0y4p97clvbq07vby7wn26zdawl8nm"; + libraryHaskellDepends = [ base distributive transformers ]; + testHaskellDepends = [ + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "barbies-layered" = callPackage ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec , hspec-discover, transformers @@ -44436,12 +44577,12 @@ self: { broken = true; }) {}; - "base_4_18_1_0" = callPackage + "base_4_19_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.18.1.0"; - sha256 = "1kwz6pyg3mww3w6c7fkqz0av81lym2gnvq48501i8nzgkzg0gj26"; + version = "4.19.0.0"; + sha256 = "03cipapd0b522zsh65a65q4nvrq8f6himh7sdag49fpr2hnw4vr6"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -44459,12 +44600,12 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat_0_13_0" = callPackage + "base-compat_0_13_1" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; - version = "0.13.0"; - sha256 = "03d3rr7v27giv90dz8128mzfa76qxkbvkzm7fiwh76l4v9sn1xlb"; + version = "0.13.1"; + sha256 = "08c43vzhq0dsnd8lqzrpimlj3h2386ybb8qksdk01fy8as6rw7fv"; libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; @@ -44486,14 +44627,14 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat-batteries_0_13_0" = callPackage + "base-compat-batteries_0_13_1" = callPackage ({ mkDerivation, base, base-compat, foldable1-classes-compat , ghc-prim, hspec, hspec-discover, OneTuple, QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.13.0"; - sha256 = "161g4g8ncnwbqafxp5hdbmv4qfmscf7b3pd88l49nkyns50ays1p"; + version = "0.13.1"; + sha256 = "00m8lx2raldr6xvlc92za11a2sj3x0031vi6v3as0cnvl58mnliy"; libraryHaskellDepends = [ base base-compat foldable1-classes-compat ghc-prim OneTuple ]; @@ -44595,8 +44736,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.9.0"; - sha256 = "0qkfs49gm0zv946h47bi8nshp6b2d6d5drlslm4adm8y4kcd8gk1"; + version = "0.9.1"; + sha256 = "0wpi3q4y9rhk5k9mz8bjy8qbl3pfxm4qqbxym3b15cn5haijvgsv"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -44608,8 +44749,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "1.6.1"; - sha256 = "0rbx6k85svqrkw5ixp2xal8bg6xrz729g7rrhkgsr3ixv38k943j"; + version = "1.6.1.1"; + sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241"; libraryHaskellDepends = [ base ]; description = "Featureful preludes formed solely from the \"base\" package"; license = lib.licenses.mit; @@ -44752,6 +44893,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "base32_0_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, memory + , QuickCheck, random-bytestring, tasty, tasty-hunit + , tasty-quickcheck, text, text-short + }: + mkDerivation { + pname = "base32"; + version = "0.4"; + sha256 = "1m08m51d49lfs5rfc5kjj0g19xq53c2ldngcykld6a4ma0fqdrws"; + libraryHaskellDepends = [ + base bytestring deepseq text text-short + ]; + testHaskellDepends = [ + base bytestring memory QuickCheck random-bytestring tasty + tasty-hunit tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq memory random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base32 encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "base32-bytestring" = callPackage ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion , hspec, QuickCheck @@ -45716,6 +45881,8 @@ self: { pname = "bcp47-orphans"; version = "0.1.0.6"; sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q"; + revision = "1"; + editedCabalFile = "0mf4plqqr6aw9jprp3fmmkpvk2g3h8hjn4wkp23ni07v818mlvlf"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent serialise text @@ -47467,8 +47634,8 @@ self: { pname = "binary-instances"; version = "1.0.4"; sha256 = "0pv4idgzl2wkm15ih594gbw6wihwrdspa91j5ajgwr4ikx6f3v3h"; - revision = "2"; - editedCabalFile = "04y9j42c3avfhf35jzh52w0zrp0m4j8cvbn3zqjjybyvhw3jgihf"; + revision = "3"; + editedCabalFile = "1ih6sdi3lhrpv78l9mikpz15r0yplnxgm9ml728ai4ja4hjjfwbb"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable primitive scientific tagged text text-binary time-compat @@ -47540,8 +47707,8 @@ self: { pname = "binary-orphans"; version = "1.0.4.1"; sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "2"; - editedCabalFile = "1q9fbn41fi4wfk8mrm9izy5jna86gmy7gxhz94crqfhp5f89v58l"; + revision = "3"; + editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary OneTuple QuickCheck quickcheck-instances tagged tasty @@ -47552,18 +47719,16 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , transformers + ({ mkDerivation, base, base-prelude, bytestring, mtl, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "binary-parser"; - version = "0.5.7.3"; - sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; + version = "0.5.7.4"; + sha256 = "06lkx75q6ffbdjl442l035xf5rl5ykjzw4488w0xnxzlmyl4v0ms"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ - base base-prelude bytestring mtl QuickCheck quickcheck-instances - tasty tasty-hunit tasty-quickcheck text transformers + base-prelude bytestring tasty tasty-hunit tasty-quickcheck ]; description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; @@ -47865,10 +48030,12 @@ self: { }: mkDerivation { pname = "binder"; - version = "0.1"; - sha256 = "0j0c3vbxxw4mcrfq1q2h3m4psjhg6kw81m2vrpnk8pqxq30v6kkv"; + version = "0.3"; + sha256 = "0swl5l3h3631fjlxn3k2vdbbj604p4bfjcfm6x3vzx3al9hnjcc8"; libraryHaskellDepends = [ base containers lens text transformers ]; - testHaskellDepends = [ base containers hspec text transformers ]; + testHaskellDepends = [ + base containers hspec lens text transformers + ]; testToolDepends = [ hspec-discover ]; description = "Variable binding for abstract syntax tree"; license = lib.licenses.mit; @@ -50454,10 +50621,8 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.3"; - sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "17"; - editedCabalFile = "00q92mlylrp73v624i6h4jc4v9yxcdm6zjhdylh7zklc2di9ihgb"; + version = "0.7.4"; + sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -52403,6 +52568,8 @@ self: { pname = "boring"; version = "0.2.1"; sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; + revision = "1"; + editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; @@ -53185,8 +53352,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.5"; - sha256 = "18113bfyak9bsn7fwjx01511g4v3qls8w5qls1q407gx3dafhyw2"; + version = "0.1.1.6"; + sha256 = "0m4m6sw4fhfy75dirnwchg3jr175d9c7splkhfkb6p4i8995m5kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53258,8 +53425,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.3"; - sha256 = "1f299fss8p7111wr56a8346zqkl02b7pcp9n6pri7wh2zrc4lw8i"; + version = "2.2.0.4"; + sha256 = "1mjwzkh6236y09h8xqzcgddypyipr2h8b4x308lh51cqb07rjczq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54331,29 +54498,6 @@ self: { }) {}; "bugzilla-redhat" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, hspec, http-conduit, http-types, iso8601-time - , resourcet, text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bugzilla-redhat"; - version = "1.0.1"; - sha256 = "19dir39yxqd5psf3gj4f3vhcbdad1np7374nkxfk0gg4xxvywcvi"; - revision = "2"; - editedCabalFile = "0gqsmxrydy6isyfx4g8snpg50i3f0jcw9yyr385ys28zw7ak29qr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring connection containers - http-conduit http-types iso8601-time resourcet text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec time ]; - description = "A Haskell interface to the Bugzilla native REST API"; - 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 @@ -54372,7 +54516,6 @@ self: { 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 @@ -55060,8 +55203,8 @@ self: { pname = "byte-order"; version = "0.1.3.0"; sha256 = "0lr5ijhc165qhviabklnl0zpbk5400wb1fqd1xn7x0ga1vvclxhl"; - revision = "1"; - editedCabalFile = "0gkp45pasdg9k98yaw3fpsch4wy50q5n4wdmqlsffciimc0k11x1"; + revision = "2"; + editedCabalFile = "136zdv7hfxp4vyd5ckc9rmadg8szjr7vrwxyjq6jlhapgh3afcqh"; libraryHaskellDepends = [ base primitive primitive-unaligned wide-word ]; @@ -55107,6 +55250,8 @@ self: { pname = "bytebuild"; version = "0.3.14.0"; sha256 = "0ql3fyd0l4gm3wbziky8r3bgd97kazpqbmiqwhrxvznf201zkhfy"; + revision = "1"; + editedCabalFile = "0pgm553m4abfq7bhrz4r0hymww32sqy4ln0j3v3ydb93x6l1fp1v"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset run-st @@ -55703,18 +55848,16 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, bytestring, criterion, quickcheck-instances + , rerebase, tasty, tasty-quickcheck }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.6"; - sha256 = "0zqi65jpf6f3gyhcg11hfn7b457c3zsmgsyqx8gi9sqh5pzn34kw"; + version = "0.4.5.7"; + sha256 = "1wblyys69avihm41lyxs04yvg1p85jp598w5ralv85mrgirb39np"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; @@ -55787,6 +55930,25 @@ self: { license = lib.licenses.mit; }) {}; + "bytestring-tree-builder_0_2_7_11" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.11"; + sha256 = "1kwj10nibw6bd0nkwg090nn27ayaq85x211ss2zvi63qs37cjmxp"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base-prelude bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base-prelude bytestring criterion ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -56543,6 +56705,8 @@ self: { pname = "cabal-debian"; version = "5.2.2"; sha256 = "1xafkjh4g60gcgrcl1l8xyla3firjxkaaks44plq1z9gnnwlfb90"; + revision = "1"; + editedCabalFile = "10saybpzsp3vwlbb3dv9glnmz8g9i79k3n3l2klmwmnggi8s35ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56741,8 +56905,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.7"; - sha256 = "1j21ynngk937p7jq361zn5kq0wiwnn6lypqm4z8z9mwa9knc2sv3"; + version = "0.1.9"; + sha256 = "00bcyx7i7h04hn2s8j7p4fsa64l48zizsdmmzqrhfiafwapmfg4n"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -57262,6 +57426,7 @@ self: { license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; mainProgram = "cabal-plan-bounds"; + maintainers = [ lib.maintainers.nomeata ]; }) {}; "cabal-progdeps" = callPackage @@ -58811,21 +58976,21 @@ self: { "candid" = callPackage ({ mkDerivation, base, base32, bytestring, cereal, constraints - , containers, crc, directory, dlist, doctest, file-embed, filepath - , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative - , parser-combinators, prettyprinter, row-types, scientific - , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, template-haskell, text - , transformers, unordered-containers, vector + , containers, digest, directory, dlist, doctest, file-embed + , filepath, hex-text, leb128-cereal, megaparsec, mtl + , optparse-applicative, parser-combinators, prettyprinter + , row-types, scientific, smallcheck, split, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun, tasty-smallcheck, template-haskell + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "candid"; - version = "0.4.0.2"; - sha256 = "04gy0nlk28hd5glzbscfhh0f01kxvxvjy2pcis8m0n4r6n7l2qlr"; + version = "0.5"; + sha256 = "1va9n08m6y9avbjxgclhasmnbf41bqx0j1s4j12rsblhci5cxqpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base32 bytestring cereal constraints containers crc dlist + base base32 bytestring cereal constraints containers digest dlist file-embed hex-text leb128-cereal megaparsec mtl parser-combinators prettyprinter row-types scientific split template-haskell text transformers unordered-containers vector @@ -59902,14 +60067,15 @@ self: { }) {}; "casr-logbook" = callPackage - ({ mkDerivation, base, containers, digit, lens, lucid, text, time + ({ mkDerivation, attoparsec, base, containers, digit, lens, lucid + , text, time }: mkDerivation { pname = "casr-logbook"; - version = "0.6.12"; - sha256 = "1s4v5a22apd7sw8c7ri8sazi1gqjg7p6b8y9j1g8avx5zc1m58f7"; + version = "0.6.13"; + sha256 = "1401mwcf5av11f37kz1hk5axzji21an4irk6fqypakply4q5kvqd"; libraryHaskellDepends = [ - base containers digit lens lucid text time + attoparsec base containers digit lens lucid text time ]; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; @@ -61108,8 +61274,8 @@ self: { pname = "cereal-conduit"; version = "0.8.0"; sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; - revision = "1"; - editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; + revision = "2"; + editedCabalFile = "1w26az4pj699qbpa9pz55g4svkbs92ls5k6wkzjn40ghisnjk2q6"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -61431,6 +61597,8 @@ self: { pname = "cfn-flip"; version = "0.1.0.3"; sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; + revision = "1"; + editedCabalFile = "0816bw34b174wpxjw99lz8z8qi2l5w00dppb7kysjdbwh8a3gws0"; libraryHaskellDepends = [ aeson base bytestring conduit libyaml text unliftio unliftio-core yaml @@ -62687,6 +62855,8 @@ self: { pname = "chimera"; version = "0.3.3.0"; sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; + revision = "1"; + editedCabalFile = "197xa0hgf2w4yhifnkqck6biipz8ffjg61y59plamb9rjv62k0bv"; libraryHaskellDepends = [ adjunctions base distributive mtl primitive transformers vector ]; @@ -62699,6 +62869,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "chimera_0_3_4_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, infinite-list + , mtl, primitive, QuickCheck, random, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers + , vector + }: + mkDerivation { + pname = "chimera"; + version = "0.3.4.0"; + sha256 = "1g3bpwhka21x6rl8c8zdwywn7vbq7gp5mc8hb5w24bh0j7cxr67l"; + libraryHaskellDepends = [ + adjunctions base distributive infinite-list mtl primitive + transformers vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; + description = "Lazy infinite streams with O(1) indexing and applications for memoization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -66179,6 +66373,8 @@ self: { pname = "cmark-gfm"; version = "0.2.6"; sha256 = "0sd8q42j51ba7ymyxk5360mhvhbnirsd371d3sggl6sbslxzp34m"; + revision = "1"; + editedCabalFile = "1385k2xvxy9ssw69g606vwnpm07sf919prciwvnaipsxiwwbjwl6"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -66634,6 +66830,19 @@ self: { license = lib.licenses.mpl20; }) {}; + "co-log-core_0_3_2_1" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.3.2.1"; + sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "co-log-json" = callPackage ({ mkDerivation, aeson, base, bytestring, co-log-core, containers , string-conv, text @@ -66653,10 +66862,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.3"; - sha256 = "1c6pyfynzd95vxywl7c110nh8z0rzhvfh9hzbq1nn4ik5whqjnbp"; - revision = "1"; - editedCabalFile = "1h35a10zh6xjqjrvj38r9kn49zzvf9lvqrpfgd6vnnsjvyi3jzsx"; + version = "0.0.1.4"; + sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -67898,8 +68105,8 @@ self: { pname = "colourista"; version = "0.1.0.2"; sha256 = "0g06116kjg9pbp0l7n33agqbks3kw5z4rjqyhylha8miah5sxbwn"; - revision = "1"; - editedCabalFile = "0wjngfcnqaibdds17q8r8v8yvbl94qxbjhmill4vi1fzfsiw4yrg"; + revision = "3"; + editedCabalFile = "1q07rz48xrs68gg3pywdivw2m97xbgcb4337jfzdsb0wv6n8z2r5"; libraryHaskellDepends = [ ansi-terminal base bytestring text ]; testHaskellDepends = [ base bytestring hspec text ]; description = "Convenient interface for printing colourful messages"; @@ -68064,8 +68271,8 @@ self: { }: mkDerivation { pname = "combinat"; - version = "0.2.10.0"; - sha256 = "125yf5ycya722k85iph3dqv63bpj1a862c0ahs2y0snyd2qd6h35"; + version = "0.2.10.1"; + sha256 = "179w7qnn3dhh71xgi21k9y0215z5v2gsa54yn1i1rhvg63z6fvkd"; libraryHaskellDepends = [ array base compact-word-vectors containers random transformers ]; @@ -68216,8 +68423,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.5.2.3"; - sha256 = "0x9pwk25bpq63nllqc00mmjbrvwzz0nw8pgxbdakpmm2ymyj9p14"; + version = "0.5.3"; + sha256 = "18s3yg8d2mfj2gkkxg1m2w3lrv1zdgv3bh2fsxzwnygr2p9451r1"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -68257,15 +68464,15 @@ self: { "comfort-blas" = callPackage ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, QuickCheck, transformers, utility-ht + , netlib-ffi, QuickCheck, semigroups, transformers, utility-ht }: mkDerivation { pname = "comfort-blas"; - version = "0.0.0.1"; - sha256 = "19wfmn6fxl31kd0f4r5gcrpp50k9j735pnbzdw4p16p9p71cqb5k"; + version = "0.0.1"; + sha256 = "1yfmhv712dnnwlh62gcq2vchmg8vcv54l50jy1mibpx1is7kjcr9"; libraryHaskellDepends = [ base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi transformers utility-ht + netlib-ffi semigroups transformers utility-ht ]; testHaskellDepends = [ base comfort-array containers doctest-exitcode-stdio doctest-lib @@ -68285,6 +68492,8 @@ self: { pname = "comfort-fftw"; version = "0.0.0.1"; sha256 = "10934ckhl5hj4k331cdhdz6512m3hyn4bm4w1xwqja4j0arndklb"; + revision = "1"; + editedCabalFile = "1vlj4jn5qzv71dw5fd32wb7gkjhs0f91yc2qxbcv2dbdzqbzkrwr"; libraryHaskellDepends = [ base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck ]; @@ -68330,6 +68539,8 @@ self: { pname = "comfort-graph"; version = "0.0.4"; sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc"; + revision = "1"; + editedCabalFile = "0lkk5p558x0dv8vfy329g2amaai76gkxdnb8nzy3miw76vvi5xrw"; libraryHaskellDepends = [ base containers QuickCheck semigroups transformers utility-ht ]; @@ -69050,6 +69261,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "compdata_0_13_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl + , QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, th-expand-syns + , transformers, tree-view, uniplate + }: + mkDerivation { + pname = "compdata"; + version = "0.13.1"; + sha256 = "001k1pd28cgbspd2n74p29hc69ch9mmkqfazki7qj17kzcaq5n2l"; + revision = "1"; + editedCabalFile = "12bhc1vpnlshq2kap9p3j6a7pxwdm7b761rr64g6c5xdla5y3vpq"; + libraryHaskellDepends = [ + base containers deepseq mtl QuickCheck template-haskell + th-expand-syns transformers tree-view + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 + th-expand-syns transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq mtl QuickCheck random + template-haskell th-expand-syns transformers uniplate + ]; + description = "Compositional Data Types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "compdata-automata" = callPackage ({ mkDerivation, base, compdata, containers, criterion, projection }: @@ -70386,8 +70627,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.19"; - sha256 = "16g749ghsqp0n6xqk9z3hj8di97r09gvw0dfk7jfq5crc02b69j2"; + version = "1.10.20"; + sha256 = "1ji1fh0dd2wl9vi9y9205hr49wjakrx5iwkk84idb7pvjnmba8wf"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -72350,6 +72591,25 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_14" = callPackage + ({ mkDerivation, base, binary, boring, deepseq, ghc-prim, hashable + , hspec, hspec-discover, mtl, transformers, type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.14"; + sha256 = "19f4rprxzlddc2w66ib612lfvz9vh979xvffyimnn3zdphm342dq"; + libraryHaskellDepends = [ + base binary boring deepseq ghc-prim hashable mtl transformers + type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -73041,6 +73301,22 @@ self: { license = lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_4" = callPackage + ({ mkDerivation, base, contravariant, template-haskell + , template-haskell-compat-v0208 + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.5.4"; + sha256 = "13i9cip0qb8piib2sfq35qvb978npra2w53zvc28fxxnik9icfig"; + libraryHaskellDepends = [ + base contravariant template-haskell template-haskell-compat-v0208 + ]; + description = "Extras for the \"contravariant\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -73953,6 +74229,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, githash, hashable, hourglass, mtl + , prettyprinter, process, safe-exceptions, stm, template-haskell + , terminal-size, text, text-short, transformers, typed-process + , unix, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.7.0.0"; + sha256 = "17xbah7g8apcksn5x32cqwcfxd6xw5z1msx0rsjg2nyyn559p2vb"; + libraryHaskellDepends = [ + base bytestring core-data core-text directory exceptions filepath + fsnotify githash hashable hourglass mtl prettyprinter process + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix unliftio-core + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl @@ -79286,8 +79584,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; - revision = "1"; - editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; + revision = "2"; + editedCabalFile = "0g0xvsrinssn2a6z9sdaa2px5ra3rvr2lm5zixlpaq845f5y52dd"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -81599,6 +81897,17 @@ self: { broken = true; }) {}; + "day-comonoid" = callPackage + ({ mkDerivation, base, comonad, kan-extensions }: + mkDerivation { + pname = "day-comonoid"; + version = "0.1"; + sha256 = "0v1p0jw51rx6p2nz9bg1qlv2zhgpwdn7y208zihr3lgz3c62fqng"; + libraryHaskellDepends = [ base comonad kan-extensions ]; + description = "A comonoid w.r.t. Day"; + license = lib.licenses.bsd3; + }) {}; + "daytripper" = callPackage ({ mkDerivation, base, bytestring, directory, falsify , optparse-applicative, tagged, tasty, tasty-hunit @@ -83009,8 +83318,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "9"; - editedCabalFile = "1ww3328aga9s7knbl8xxvsff13gdnl3rdqplpx11rl6k6gnr032k"; + revision = "10"; + editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -83098,21 +83407,20 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector + , primitive, quickcheck-instances, rerebase, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.3"; - sha256 = "0x27yqcmpcdfnpf7hn0v574wr641xg23k8fn18w9klc0l3m3089v"; + version = "0.9.18.5"; + sha256 = "1riczgknn87b7cqpk8crq33zwkq80gv5ha9ang5ib5rlg6fmckn4"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; @@ -85372,10 +85680,10 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-lsp-server"; - maintainers = [ lib.maintainers.Gabriella439 ]; - broken = true; + maintainers = [ + lib.maintainers.dalpd lib.maintainers.Gabriella439 + ]; }) {}; "dhall-nix" = callPackage @@ -85820,6 +86128,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "di-monad_1_3_5" = callPackage + ({ mkDerivation, base, conduit, containers, di-core, exceptions + , monad-control, mtl, pipes, pipes-safe, primitive, resourcet, stm + , streaming, transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "di-monad"; + version = "1.3.5"; + sha256 = "0l22yqigv7nkc54bcnz2fy8kxnl8dgj1wzs8cf24fy1apahz8kx0"; + libraryHaskellDepends = [ + base conduit containers di-core exceptions monad-control mtl pipes + pipes-safe primitive resourcet stm streaming transformers + transformers-base unliftio-core + ]; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "di-polysemy" = callPackage ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { @@ -86508,6 +86835,8 @@ self: { pname = "dialogue"; version = "0.1.0"; sha256 = "03rlcyvkzm9fyqdsgswx9sgw2jdiplngw9a1rknngwnwnx5mqbpm"; + revision = "1"; + editedCabalFile = "1g4297n8xdnjs8ylxvs3whqq2d984g57fyxb7dm46dm809mhbhd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory ]; @@ -87653,6 +87982,8 @@ self: { pname = "directory"; version = "1.3.8.1"; sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; + revision = "1"; + editedCabalFile = "1yd7hqs70486gbf7yms6gbx2zm34m1hakx5rh3dd4rd38w4hlfxx"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -88357,6 +88688,8 @@ self: { libraryHaskellDepends = [ base ghcjs-base-stub stm ]; description = "Allows storing different resource-releasing actions together"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dist-upload" = callPackage @@ -90220,7 +90553,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_1" = callPackage + "doctest_0_22_2" = callPackage ({ mkDerivation, base, code-page, deepseq, directory, exceptions , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover , HUnit, mockery, process, QuickCheck, setenv, silently @@ -90228,8 +90561,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.1"; - sha256 = "0xszdclizmlf5gsnn4fwbvncjs6fbif9a5956pnxr50g5fxfi6xk"; + version = "0.22.2"; + sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90396,6 +90729,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.1"; + sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -92254,8 +92614,8 @@ self: { pname = "dual-tree"; version = "0.2.3.1"; sha256 = "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh"; - revision = "1"; - editedCabalFile = "0prbgzh1bhgrg6qxp5l2m33f5xcjjjpzbm32xx2rgyi4w1yf3587"; + revision = "2"; + editedCabalFile = "1qlrrvw3j9h12nj105aa5ckri5580xgbi16gph70i5w2crmrvphw"; libraryHaskellDepends = [ base monoid-extras semigroups ]; testHaskellDepends = [ base monoid-extras QuickCheck semigroups testing-feat @@ -95395,17 +95755,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "eliminators_0_9_3" = callPackage + "eliminators_0_9_4" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.3"; - sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; - revision = "1"; - editedCabalFile = "0nxnc1y8lnwmbg1igd8mndkav0ilvb20pbs0d2yvxr032bi35jc4"; + version = "0.9.4"; + sha256 = "1qr02xlmb6nfd505z0iw7bj7kpha8wyvcr31rm92r1a78pwvysaf"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -96139,7 +96497,6 @@ self: { ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "ema-extra" = callPackage @@ -96465,7 +96822,6 @@ self: { badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "embed-config" = callPackage @@ -98092,8 +98448,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; - revision = "4"; - editedCabalFile = "0sji6ny86f4j9ch1cyf2p1mcr5b2ighvw4bb9rssvypxb6k2r68f"; + revision = "5"; + editedCabalFile = "0ljfsadhqbqjivrr08x11zazpl115902ikvyhxq6nmg6zp54w7al"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -98445,6 +98801,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto-compat" = callPackage + ({ mkDerivation, base, conduit, esqueleto, hspec, persistent + , resourcet, transformers + }: + mkDerivation { + pname = "esqueleto-compat"; + version = "0.0.2.0"; + sha256 = "0r76i5597lmd31384k0961hvps57xcf9dadscvd729yrf0plahvk"; + libraryHaskellDepends = [ + base conduit esqueleto persistent resourcet transformers + ]; + testHaskellDepends = [ base hspec ]; + description = "Compatibility operators for Persistent and Esqueleto"; + license = lib.licenses.bsd3; + }) {}; + "esqueleto-pgcrypto" = callPackage ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent , persistent-postgresql, QuickCheck, text, transformers, unliftio @@ -99308,10 +99680,8 @@ self: { }: mkDerivation { pname = "event-list"; - version = "0.1.2"; - sha256 = "177q99iswmanh34wlgklw1djvv5v1c0b5ysyi7mdmb70fsw30kk2"; - revision = "1"; - editedCabalFile = "19n1snzzqg4mkpss2b29zsv8h4n1nmzcmyclap11gcsjmv75mwzh"; + version = "0.1.2.1"; + sha256 = "0wkrzflrkaa7qg4lwzgfm0dhmghgiqph4hnpnd4smpv98sz3bcq0"; libraryHaskellDepends = [ base non-negative QuickCheck semigroups transformers utility-ht ]; @@ -100737,8 +101107,8 @@ self: { }: mkDerivation { pname = "exitcode"; - version = "0.1.0.6"; - sha256 = "07knpcak3ca38r7g9x4ixi36rg6zllrn2azbqlkgmmdqwqmcaj7w"; + version = "0.1.0.9"; + sha256 = "0g63q2y1ipgnylfjp28yly6lbps7gbnam7lpg1x8hnmlvfz89mj7"; libraryHaskellDepends = [ base bifunctors filepath lens mtl process semigroupoids semigroups transformers @@ -100767,17 +101137,15 @@ self: { }) {}; "exon" = callPackage - ({ mkDerivation, base, criterion, flatparse, generics-sop - , ghc-hs-meta, hedgehog, incipit-base, tasty, tasty-hedgehog - , template-haskell + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell }: mkDerivation { pname = "exon"; - version = "1.5.0.1"; - sha256 = "1kj81x9haqvx61bi3f7baaqxnbpw6xkyfcmgb3653c1wiscd756d"; + version = "1.6.0.1"; + sha256 = "0r26dvc4dc865x84pz8y4yh43pzzgdy524aggwn3q2m3frdc7zba"; libraryHaskellDepends = [ - base flatparse generics-sop ghc-hs-meta incipit-base - template-haskell + base ghc incipit-base parsec template-haskell ]; testHaskellDepends = [ base hedgehog incipit-base tasty tasty-hedgehog template-haskell @@ -101058,8 +101426,8 @@ self: { pname = "explicit-exception"; version = "0.2"; sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; - revision = "1"; - editedCabalFile = "0k1299cvh6ayh26nidxnywpdmby5v52k23kyaxzla5i611306v10"; + revision = "2"; + editedCabalFile = "0wixdj39wxyfy82yp344nn38b6d1cmf32jmx89x98j4pvqb65cy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -101372,8 +101740,8 @@ self: { pname = "extended-reals"; version = "0.2.4.0"; sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; - revision = "1"; - editedCabalFile = "07qsnn05q9n2l4jh7agql44l2z7rqnwdcp9bssri4chs0jvk15rg"; + revision = "2"; + editedCabalFile = "1v4vcrf66bapldw5jswkp4jb1v1qlr5cx2mgjnxb8mszir7s6p1f"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -101553,8 +101921,8 @@ self: { }: mkDerivation { pname = "extensions"; - version = "0.1.0.0"; - sha256 = "1b4wiw228hlk0ywjzpgw7rg9nwfmav82c976ipn0ql0gyh7v27xc"; + version = "0.1.0.1"; + sha256 = "1rf6jhmms6ll7mn9rh81amzb7nd4zjqcnxdzivw50dxcrcfmdiq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101571,7 +101939,9 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; + broken = true; }) {}; "external-sort" = callPackage @@ -102216,6 +102586,8 @@ self: { pname = "faktory"; version = "1.1.2.4"; sha256 = "0mn888cjk8ag94il7zcbk6q5cq2vf2dxf1b8ba8ki2rypxld5m7a"; + revision = "1"; + editedCabalFile = "10gpavyqdx9kcrp963wgx0jfvm4xf97yg92y4gvk5vkpjipmx5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102245,6 +102617,8 @@ self: { pname = "faktory"; version = "1.1.2.5"; sha256 = "0ax5hk98k4v8vnhv6rvbjxhynqkzijb5l7dbaxp15mh6yd2y981f"; + revision = "1"; + editedCabalFile = "072nm86gyqgnrcfdq466nkpkcsp417zibj1ni2s9b7ndw63x4k1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103128,8 +103502,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.3.2"; - sha256 = "0qzfn271ka46f11hrbzq8axc3npkx1n5y5pihpg1gdccqmw6aazq"; + version = "1.3.3"; + sha256 = "1j4g4q37ly0np6zyyswfx79i5hn3pj4zzby0y5k62jin2v6xvq3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103505,14 +103879,24 @@ self: { }) {}; "fec" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, criterion, data-serializer + , deepseq, extra, hspec, QuickCheck, quickcheck-instances, random + }: mkDerivation { pname = "fec"; - version = "0.1.1"; - sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.0"; + sha256 = "018vwvx2ailk7yc8a5jxbnykca212gr8p7kv3v6k8dnp881flilw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring deepseq extra ]; + executableHaskellDepends = [ base bytestring criterion random ]; + testHaskellDepends = [ + base bytestring data-serializer hspec QuickCheck + quickcheck-instances random + ]; description = "Forward error correction of ByteStrings"; - license = "GPL"; + license = lib.licenses.gpl2Plus; + mainProgram = "benchmark-zfec"; }) {}; "fedora-composes" = callPackage @@ -104441,14 +104825,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_1_1" = callPackage + "fgl_5_8_2_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.1.1"; - sha256 = "1bccd85756nk09hgv6h52k4vkxw2xdqbk5m20g8q6301rdpgs239"; + version = "5.8.2.0"; + sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -104960,16 +105344,16 @@ self: { "filepather" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant - , directory, filepath, lens, mmorph, mtl, semigroupoids, time - , transformers + , directory, exitcode, filepath, lens, mmorph, mtl, semigroupoids + , time, transformers }: mkDerivation { pname = "filepather"; - version = "0.5.1"; - sha256 = "1drd7sfng2bmrmprj3yqazd76j2jny3rxcid7xvq95ga2imch45w"; + version = "0.5.5"; + sha256 = "05dqkpdhlw6lkkrwvdk2g6bcymr1mpn55ky4vzyd9729xglk5c5p"; libraryHaskellDepends = [ - base bytestring containers contravariant directory filepath lens - mmorph mtl semigroupoids time transformers + base bytestring containers contravariant directory exitcode + filepath lens mmorph mtl semigroupoids time transformers ]; description = "Functions on System.FilePath"; license = lib.licenses.bsd3; @@ -105779,8 +106163,8 @@ self: { }: mkDerivation { pname = "fits-parse"; - version = "0.3.5"; - sha256 = "0gs3ikdsn7g9g1mpdibimvybgmawmmpm8af6cj9gn0c617gqdm6r"; + version = "0.3.6"; + sha256 = "19mwisig0ffxyni6b1yqs9vxnl5161vxl7zj5bj96njw1f3sjxqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107745,6 +108129,20 @@ self: { license = lib.licenses.mit; }) {}; + "focus_1_0_3_2" = callPackage + ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "focus"; + version = "1.0.3.2"; + sha256 = "11n2dh0ilc2hqh96ivy1k2y3pi8y1ll11awp4r3h40w17023yjz2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "A general abstraction for manipulating elements of container data structures"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "focuslist" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , genvalidity, genvalidity-containers, genvalidity-hspec, hedgehog @@ -108172,8 +108570,8 @@ self: { }: mkDerivation { pname = "fontconfig-pure"; - version = "0.3.0.0"; - sha256 = "1a9kd8wl2078bkh3p45z0m4zq8g3ya8gnzri0g3dj6rpjhrmhh51"; + version = "0.4.0.0"; + sha256 = "05nlnr5v1gfi0wrksdpzszpvj1vj5ff2wv2nzm7g43dr9j33xyf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109298,10 +109696,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fractionizer"; - version = "0.10.0.0"; - sha256 = "0bda0bv4skc53x1x37p71a7n2a994wp45y1143447fv87bj4pmjx"; + version = "0.17.0.0"; + sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243"; libraryHaskellDepends = [ base ]; - description = "Allows to approximate the fractional numbers in the range [0.005, 1] with sum of 2 or 3 unit fractions of special types."; + description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types."; license = lib.licenses.mit; }) {}; @@ -109454,16 +109852,17 @@ self: { , 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, yesod-test + , persistent-postgresql, postgresql-simple, primitive, pureMD5 + , QuickCheck, resource-pool, resourcet, retry, safe, scientist + , semigroupoids, serialise, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml + , yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.10.1.0"; - sha256 = "1kwqiglc28xh73qh7fqs4233rxadfpp7yff9vf289xklw6c8la51"; + version = "1.10.2.0"; + sha256 = "18d8594pz123kbhvw3igazs5ngd8rrs050ivb1hmksr6x2r6b6mm"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit @@ -109477,8 +109876,8 @@ self: { 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 + pureMD5 resource-pool resourcet retry safe scientist semigroupoids + serialise template-haskell text time transformers transformers-base typed-process unliftio unliftio-core unordered-containers vector wai wai-extra yaml yesod-core yesod-test ]; @@ -111902,9 +112301,8 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; - broken = true; + maintainers = [ lib.maintainers.athas ]; }) {}; "futhark-data" = callPackage @@ -112174,21 +112572,21 @@ self: { }) {}; "fuzzyset" = callPackage - ({ mkDerivation, base, data-default, hspec, ieee754, text - , text-metrics, unordered-containers, vector + ({ mkDerivation, base, hspec, ieee754, mtl, text, text-metrics + , transformers, unordered-containers, vector }: mkDerivation { pname = "fuzzyset"; - version = "0.2.4"; - sha256 = "0rj6d5z2cy954w3xzq4dfn0i3dg2idb8y2lcf2f10ar42r58zhxn"; + version = "0.3.1"; + sha256 = "07i0ygbikr5rdmwp00yrql6xjprzhkqb5jr12w1l56n1xssf71zx"; libraryHaskellDepends = [ - base data-default text text-metrics unordered-containers vector + base mtl text text-metrics transformers unordered-containers vector ]; testHaskellDepends = [ - base data-default hspec ieee754 text text-metrics + base hspec ieee754 mtl text text-metrics transformers unordered-containers vector ]; - description = "Fuzzy set for approximate string matching"; + description = "Fuzzy set data structure for approximate string matching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -113715,6 +114113,8 @@ self: { pname = "generic-data"; version = "1.1.0.0"; sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; + revision = "1"; + editedCabalFile = "1njfdpp8rckkibixp89rz8dh4qmz67404gbwq2l0qmfcglzf997p"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -114050,18 +114450,21 @@ self: { "generic-persistence" = callPackage ({ mkDerivation, base, convertible, generic-deriving, HDBC - , HDBC-sqlite3, hspec, hspec-discover, QuickCheck, resource-pool + , HDBC-postgresql, HDBC-sqlite3, hspec, hspec-discover, QuickCheck + , raw-strings-qq, resource-pool, template-haskell }: mkDerivation { pname = "generic-persistence"; - version = "0.4.0.0"; - sha256 = "18k08qr3zc56zgk6m2g6mh5138v0lf7rh4warvz8vfpxm5wvbn7i"; + version = "0.6.0"; + sha256 = "00clpi6ijwagp3zrjb94kwv03wxcx4aqq22zn32kxhz8b3w71jd1"; libraryHaskellDepends = [ - base convertible generic-deriving HDBC resource-pool + base convertible generic-deriving HDBC raw-strings-qq resource-pool + template-haskell ]; testHaskellDepends = [ - base convertible generic-deriving HDBC HDBC-sqlite3 hspec - hspec-discover QuickCheck resource-pool + base convertible generic-deriving HDBC HDBC-postgresql HDBC-sqlite3 + hspec hspec-discover QuickCheck raw-strings-qq resource-pool + template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; @@ -114305,6 +114708,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "generics-sop_0_5_1_4" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generics-sop"; + version = "0.5.1.4"; + sha256 = "0zkri1w7qdqlxcfx0kzld7ai5g7xzxwxjxjfa7wnjx09fqhiqsk1"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell th-abstraction + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -114751,25 +115174,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "1.0.0.2"; - sha256 = "00sv0mzlvny5ch7c9fnd19szqd0pjrkvi080x1i62qa5fdzs5yc4"; - 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; - }) {}; - - "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 = [ @@ -114781,7 +115185,6 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -114852,27 +115255,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "1.0.0.0"; - sha256 = "14fg796iivlpp4gqsmma9zf0z9iqk524ydyqmza83qrjh8v2ff5v"; - 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; - }) {}; - - "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 = [ @@ -114885,7 +115267,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -114928,24 +115309,27 @@ self: { }) {}; "genvalidity-mergeful" = callPackage - ({ mkDerivation, base, containers, criterion, genvalidity - , genvalidity-containers, genvalidity-criterion, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid - , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid + ({ mkDerivation, autodocodec, autodocodec-yaml, base, containers + , criterion, genvalidity, genvalidity-containers + , genvalidity-criterion, genvalidity-sydtest + , genvalidity-sydtest-aeson, genvalidity-time, genvalidity-uuid + , mergeful, mtl, pretty-show, QuickCheck, random + , safe-coloured-text, sydtest, sydtest-discover, time, uuid }: mkDerivation { pname = "genvalidity-mergeful"; - version = "0.3.0.0"; - sha256 = "0dd22kdlydhdns86awmmzbnr9bwrb84623zcyb5b9aaxmq75ifza"; + version = "0.3.0.1"; + sha256 = "1k18biwqva6wkdhapwfr56xrbsvyqp6183p0fi2kma4rv3g4hfpy"; libraryHaskellDepends = [ base containers genvalidity genvalidity-containers genvalidity-time mergeful QuickCheck ]; testHaskellDepends = [ - base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random - time uuid + autodocodec autodocodec-yaml base containers genvalidity-sydtest + genvalidity-sydtest-aeson genvalidity-uuid mergeful mtl pretty-show + QuickCheck random safe-coloured-text sydtest time uuid ]; + testToolDepends = [ sydtest-discover ]; benchmarkHaskellDepends = [ base criterion genvalidity-criterion mergeful ]; @@ -115034,32 +115418,6 @@ self: { }: mkDerivation { pname = "genvalidity-persistent"; - version = "1.0.0.1"; - sha256 = "1h3illab5k0rzmyi1pjc4yij2dsxn9gnmrvdgll32plxkdmyp0jr"; - 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; - }) {}; - - "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 = [ @@ -115076,7 +115434,6 @@ self: { ]; description = "GenValidity support for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -115158,27 +115515,6 @@ self: { }: mkDerivation { pname = "genvalidity-sydtest-hashable"; - version = "1.0.0.0"; - sha256 = "05482ynm19k9wj0hvvlfimvdng1wkl35409lp1r6vj02b7ml4i2z"; - 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; - }) {}; - - "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 = [ @@ -115192,7 +115528,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for Hashable instances for sydtest"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-lens" = callPackage @@ -115310,27 +115645,6 @@ self: { }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "1.0.0.0"; - sha256 = "1sd67x2kw7l0kbsaa67x3an94sv1hvnkbb8r42v36cc5jjaw29dk"; - 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; - }) {}; - - "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 = [ @@ -115343,7 +115657,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -115865,21 +116178,24 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_6_3" = callPackage + "ghc_9_8_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, stm, template-haskell, time, transformers, unix + , process, semaphore-compat, stm, template-haskell, time + , transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.6.3"; - sha256 = "0zl2g21ak4awsfr4qq2fdxngwnbhr27jsqnn15ld3wwhnwx9d106"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "9.8.1"; + sha256 = "15863rp4lcpz2h7f0ncix7n53b5yxk5ndp0g8hk4z1b1y2dwm0w3"; + setupHaskellDepends = [ + base Cabal containers directory filepath process + ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-boot ghc-heap ghci hpc process stm - template-haskell time transformers unix + exceptions filepath ghc-boot ghc-heap ghci hpc process + semaphore-compat stm template-haskell time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -115954,14 +116270,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_6_3" = callPackage + "ghc-boot_9_8_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.6.3"; - sha256 = "0m0w1v1s63w4zzh18q4ac403pxm7ic0v6cc6r8fl0pjl0cxsgbwr"; + version = "9.8.1"; + sha256 = "080qalf35kvf9qgyn9w59m1szwl5n8ahvjdzqr7vrd5kf0f9cczz"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -115972,12 +116288,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_6_3" = callPackage + "ghc-boot-th_9_8_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.6.3"; - sha256 = "05bp3yr0pmim1zzc5jrbsvjb3vpvbg8wi4n9339s3cvrral57p5b"; + version = "9.8.1"; + sha256 = "16vsirgz8g0zmika6pr638mh4s5xrgwsc6dgnhyhwryg10mabp66"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -115990,8 +116306,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; - revision = "4"; - editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b"; + revision = "5"; + editedCabalFile = "1q56xwm9rvjaix9l2bvfgkkcr0mg9n8f23a7mvvd8ij9b34pd3qa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -116536,12 +116852,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_6_3" = callPackage + "ghc-heap_9_8_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.6.3"; - sha256 = "17lfv1cdqcrh8g6lps9lkisn3imfylg89xqx4k8amh59b9l4jmj6"; + version = "9.8.1"; + sha256 = "1z0gghf7ki2sz60ikgdw3d42djphl5lf27z8mfnzcvxp3p6ajxmz"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -116586,10 +116902,8 @@ self: { }: mkDerivation { pname = "ghc-hs-meta"; - version = "0.1.2.0"; - sha256 = "13i4fcc3wfx94n75cxp00p62mnm0raf2xqj2afrzcw3q6mc0l0y4"; - revision = "1"; - editedCabalFile = "18wp54bnfx7ks9zvsjpykpkpr7gwqql6bq8n85mydgx9zm5638dz"; + version = "0.1.3.0"; + sha256 = "1w1l7l3c96k30v715sbf4vhzw7q86p4piwq91i9zqijgy0wl9rz6"; libraryHaskellDepends = [ base bytestring ghc ghc-boot template-haskell ]; @@ -116737,7 +117051,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_6_2_20230523" = callPackage + "ghc-lib_9_6_3_20231014" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -116745,8 +117059,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.6.2.20230523"; - sha256 = "0wlmljbalbfm2y9i2c5ygnsks4gbfzw6ap725bffjcpwd8ma8cq4"; + version = "9.6.3.20231014"; + sha256 = "0ax6g4vvwv2913dl2l1jisf7v3c28p4h0mc0z45g6iap6gkndnf7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116759,6 +117073,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib_9_8_1_20231009" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts + , semaphore-compat, stm, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.8.1.20231009"; + sha256 = "09qlh8yjfi1380p3sibhfc16n7kx1yz22g1lvr5zjpwq4i3pjnpm"; + revision = "1"; + editedCabalFile = "1y25kfansr726l508mc86a6i20gvca6mr0b5fibicjmg4s5z908l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts semaphore-compat stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_8_10_7_20220219" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, pretty, process @@ -116820,15 +117158,38 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_6_2_20230523" = callPackage + "ghc-lib-parser_9_6_3_20231014" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.6.3.20231014"; + sha256 = "1k3p7j63cbr4v9cyj5acqbhj16198x7fjc7cpl8pvyv6m4lr571q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ghc-lib-parser_9_8_1_20231009" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.2.20230523"; - sha256 = "104q0lw7maz1ma67invxz6aw9pn99j3f9l15nl3387pgxb666gjq"; + version = "9.8.1.20231009"; + sha256 = "1s3w8ggzil7dskns0fyk744xmi8b5q98lcqvw188z92h5md9yi2j"; + revision = "1"; + editedCabalFile = "1sck4dgbl8sakz7r1vc79paacic4ll92cw8hzbl658ykkn3qr6mh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116920,6 +117281,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.8.0.0"; + sha256 = "1xchnw1x27k3v02h0mpvm0m78jkhb1kvybjgrky7a3wfn3irv1nj"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -117159,13 +117540,13 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-prim_0_10_0" = callPackage + "ghc-prim_0_11_0" = callPackage ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.10.0"; - sha256 = "1n9skdsfiya4hlfw44f4p9a14xwnmjxgpdcddlqxkc3gscs62m6q"; + version = "0.11.0"; + sha256 = "118c37r8q94x0za1x6iqlfl429czgp5ii6mjdb1f7ba3nx9azzl5"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ rts ]; librarySystemDepends = [ c ]; @@ -117409,13 +117790,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_10_0" = callPackage + "ghc-syntax-highlighter_0_0_11_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.10.0"; - sha256 = "145xjyraqd62k5amyqi9028rr9v2lgz3irmgz5v2hppza1i5qy72"; + version = "0.0.11.0"; + sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -117562,8 +117943,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.4"; - sha256 = "0yfyxwjsg0r6biy8mskc0xpm32z6zldhzxlvy9dr22h8ds57089w"; + version = "0.4.5"; + sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -117620,8 +118001,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.5"; - sha256 = "1asr1ykmqalvbyrhf91vsnx989vw3qp28w8sl3pgwns1azirsz7r"; + version = "0.4.6"; + sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -117641,8 +118022,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.8"; - sha256 = "08pa3gbzxmz5iif9ggg7xvg0bz0h4h4bdnwkvy6lljh2r4fyw8r7"; + version = "0.7.9"; + sha256 = "1h3d0vjz3j9cgng330dj4zlvnvjkwzk2f76w1q6b5vda5pq676cd"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -117661,8 +118042,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.8"; - sha256 = "0hny036kinnn73byyhdwvmp2s5c27zs7krrz01kx5xk7mmhhx2nn"; + version = "0.7.9"; + sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-tcplugins-extra transformers ]; @@ -117964,8 +118345,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.3.0.0"; - sha256 = "0h05xdq46bchlk64x3rlf1gn2xz3sjr9pay0b1p2l7jc951czdg4"; + version = "2.4.0.0"; + sha256 = "1pscx95wmykrrlycpavh1j8vwp3x0k1cfvq9ndpz3qmj8djyyxb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118009,8 +118390,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "2.3.0.0"; - sha256 = "17clwl9scj3yzg6x8krmcjpi90h9ivrf840xw3y90n2lx0835w04"; + version = "2.4.0.0"; + sha256 = "0glpjp3qrnbmbn8xi78lgx88v3lppljny9lxyi45dzf71hzab2yc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118090,6 +118471,8 @@ self: { ]; description = "Allow GHCJS projects to compile under GHC and develop using intero"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-codemirror" = callPackage @@ -118196,6 +118579,8 @@ self: { ]; description = "GHCJS bindings for the JavaScript Fetch API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-hplay" = callPackage @@ -118484,6 +118869,8 @@ self: { description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -118986,7 +119373,7 @@ self: { "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , gi-gobject, graphene, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -118998,12 +119385,10 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ graphene-gobject ]; + libraryPkgconfigDepends = [ graphene ]; description = "Graphene bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {graphene-gobject = null;}; + }) {inherit (pkgs) graphene;}; "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -119028,6 +119413,7 @@ self: { description = "Gsk bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage @@ -119928,6 +120314,18 @@ self: { mainProgram = "gibbon"; }) {}; + "gigaparsec" = callPackage + ({ mkDerivation, base, containers, selective, tasty, tasty-hunit }: + mkDerivation { + pname = "gigaparsec"; + version = "0.1.0.0"; + sha256 = "177y3rnsg4zy94j2snpcnqdq754b33ni7m07fs7srbyarpm6kd21"; + libraryHaskellDepends = [ base containers selective ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + description = "Refreshed parsec-style library for compatiblity with Scala parsley"; + license = lib.licenses.bsd3; + }) {}; + "gimlh" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -120255,9 +120653,7 @@ self: { ]; description = "git checkout command-line tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "git-brunch"; - broken = true; }) {}; "git-checklist" = callPackage @@ -121142,6 +121538,31 @@ self: { broken = true; }) {}; + "gitlab-haskell_1_0_0_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , connection, http-client, http-conduit, http-types, mtl, tasty + , tasty-hunit, temporary, text, time, transformers, tree-diff, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "1.0.0.3"; + sha256 = "0jddsxj746pfziq4i3z750v290r3m0v3wifz3kisb6ais3794cjn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-client http-conduit + http-types mtl temporary text time transformers unix + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring tasty tasty-hunit text + tree-diff unordered-containers vector + ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -122634,6 +123055,8 @@ self: { pname = "gnuplot"; version = "0.5.7"; sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; + revision = "1"; + editedCabalFile = "1x0ik81nmrxi77p1k4f7j4d5s9ajs0cy9jhr41b0qhvfsimyf0cn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125199,8 +125622,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "3"; - editedCabalFile = "17v3xw6jqx74nfzgd4snqgj560i0v822vfvwkp5rq0xn1a8p4nxz"; + revision = "4"; + editedCabalFile = "03jfrffs2ip7i4qqxhy8cjynygnaahpw1z19xg4j2fh32h669i53"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125351,7 +125774,6 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -125486,7 +125908,6 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-translate" = callPackage @@ -125597,8 +126018,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.3"; - sha256 = "0rxkpxm7606lpiw4csixqfmd025f7rp6ivv86c6ximjlqzz1krhz"; + version = "0.6.6.4"; + sha256 = "052n39bnz55d8lmi3d79s0zxhzbspz6a5rw965qqbryi82hgrdp4"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -127047,6 +127468,8 @@ self: { pname = "graphula"; version = "2.0.2.2"; sha256 = "066lcn262x4l826sglybrz4mp58ishcj0h1r5h41aiy09mcf4g3v"; + revision = "2"; + editedCabalFile = "1wfvg8mkiyw5vh20syawrl201dwjx4ggd03pg1f06499anykcs8z"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text unliftio unliftio-core @@ -130469,8 +130892,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; - revision = "7"; - editedCabalFile = "09hahx1a7vvmi1y4z5h3bnvmikjdcqhdvyvmndp5q861dl3iwj98"; + revision = "8"; + editedCabalFile = "1gzk9hrq0rv94msbvnkynzj5pnh94ixray8dl639zr29qh55cbib"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -131746,8 +132169,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.4"; sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "4"; - editedCabalFile = "0lqh8dijpzw1piy3b8j2haqkkx0cqlpfs0i7x7636y2r9yl0kxl7"; + revision = "5"; + editedCabalFile = "01jpc6jp8brayi9v7ynchjgpx40dpzjcwy5lgmzkx043w5xcm6sn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135924,8 +136347,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.3.0.0"; - sha256 = "1q0xxmqhvgad89zg4qg3a4660qdmxy1m6sspyf9a7l4v2jxyl8vi"; + version = "2.4.0.0"; + sha256 = "0jzbvss1ayvq43cljvn5j2bnyrmbgwv12ik81ivqsa6dnf3xbiqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136497,7 +136920,6 @@ self: { description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-snake"; }) {}; @@ -138271,8 +138693,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.2.1"; - sha256 = "1jnglyi1kmfxl69gczws2pp4x43jazrkdm5bdh978ckv9v94s849"; + version = "1.2.2"; + sha256 = "0jz4y90lp54wh2crlxvvc21gfiwdf0rmcj8f712wbgb648lyzha8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138338,7 +138760,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_2_0" = callPackage + "haskoin-store-data_1_2_2" = 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 @@ -138347,8 +138769,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.2.0"; - sha256 = "0a1b33q9b93wsjl2kr7iiy0fxbxi1bbdpna62sm3d2dv6lj1gck7"; + version = "1.2.2"; + sha256 = "0zqyj4dq0j2f0bn4qwvrar1b6jvcaqni296lhigpwy0h0jv8080f"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -138653,8 +139075,8 @@ self: { pname = "hasktags"; version = "0.73.0"; sha256 = "0w0g50ggdmkpxgwqdwdbizw3cz8q86l1xwhvj3bjczh72q5xa0nh"; - revision = "1"; - editedCabalFile = "1zxfnrrcbkv5if0sk8qq9f7bbhm8b7xcmavvl0ad5j1zhk9nlqy5"; + revision = "2"; + editedCabalFile = "175kmkz4k2dssn4dg0d288allkqwx8y6m3p7pcgg88km8d2p0mgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139279,6 +139701,35 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_6_3_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, network-ip + , postgresql-binary, postgresql-libpq, profunctors + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers, uuid + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.6.3.3"; + sha256 = "1w4lpiy4jynzdp1b5fn36zv5jyfgnh0fp8rr6dz7247ajzx7lfq4"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-strict-builder + contravariant dlist hashable hashtables mtl network-ip + postgresql-binary postgresql-libpq profunctors scientific text + text-builder time transformers uuid vector + ]; + testHaskellDepends = [ + contravariant-extras quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -141499,8 +141950,8 @@ self: { }: mkDerivation { pname = "hdf5"; - version = "1.8.10"; - sha256 = "05mpfbs1hcpm92yg8x75vn7j559ivm3gixc8qj8b3xk2mz30ckai"; + version = "1.8.11"; + sha256 = "1vczdmm389zg002ay1x4ia4xx6k41zz0qj5979di03mjlrzq9nws"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector @@ -142248,6 +142699,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; + revision = "1"; + editedCabalFile = "1gk52hz1ssib7cbam7nk8nws9322rsgkn7ym45dgwjbvqbz3wqs7"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -142329,19 +142782,19 @@ self: { "hedgehog-extras" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog - , http-conduit, hw-aeson, mmorph, mtl, network, process, resourcet - , stm, tar, temporary, text, time, transformers, unliftio + , http-conduit, mmorph, mtl, network, process, resourcet, stm, tar + , temporary, text, time, transformers, unliftio , unordered-containers, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.7.0"; - sha256 = "08144dhnnbbl7mmlypx4ji6hsifjf4ssvqh3zhyjk6zwnj5jng13"; + version = "0.4.7.1"; + sha256 = "03inmpmfh5lmrv62szrz96wrknsmpfivcgyilklpmw1k3ijm8a9x"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory - exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl - network process resourcet stm tar temporary text time transformers - unliftio unordered-containers yaml zlib + exceptions filepath hedgehog http-conduit mmorph mtl network + process resourcet stm tar temporary text time transformers unliftio + unordered-containers yaml zlib ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; @@ -144103,15 +144556,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "hetzner_0_4_0_1" = callPackage + "hetzner_0_5_0_0" = 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"; + version = "0.5.0.0"; + sha256 = "0xrmbjv52w0gzdfvkgc6mxmq7887qsywz2xb8yrls1szw938x6q8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145185,6 +145638,8 @@ self: { pname = "hgettext"; version = "0.1.40.1"; sha256 = "1wdwrp4zjhjjq49yihid9x4lhx26nbixax84njj02d79wq2kmdb7"; + revision = "1"; + editedCabalFile = "07rr74szf26mbfj3840ln2r7sjjl8asql14yga8kw82cynzhzym5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145498,15 +145953,18 @@ self: { }) {}; "hi-file-parser" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, vector + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.4.0"; - sha256 = "0kaazv6qfpg7n52wms08hf63ic776p9wyyylsh0d4yrh1sbh1s52"; - libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; + version = "0.1.5.0"; + sha256 = "0j6ici0s52fpyf092d3zw4qrvwmz744q538wnxxj48i8fxm7b95m"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; testHaskellDepends = [ - base binary bytestring hspec mtl rio vector + base binary bytestring hspec mtl rio text vector ]; description = "Parser for GHC's hi files"; license = lib.licenses.bsd3; @@ -146712,6 +147170,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hint_0_9_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random + , stm, temporary, text, transformers, typed-process, unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0.8"; + sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; + libraryHaskellDepends = [ + base containers directory exceptions filepath ghc ghc-boot + ghc-paths random temporary transformers unix + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath HUnit stm + text typed-process unix + ]; + description = "A Haskell interpreter built on top of the GHC API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -147299,8 +147779,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.6.7"; - sha256 = "1549cgc4vw1zlqg3qwslimhf17ci7c5yad4k5jrdz1mf0qqk4cv5"; + version = "0.6.9"; + sha256 = "02ihihlxxvcndm7hjiwknj1dar4d3hdwrg83zsr6q1w7gssr9bbi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147554,8 +148034,8 @@ self: { ({ mkDerivation, base, some }: mkDerivation { pname = "hkd"; - version = "0.2"; - sha256 = "1sq0w5n6y7m2qqpl9s04hsg14qc7p8xrj4x1s1lhw9qbapwb8g8w"; + version = "0.2.1"; + sha256 = "1ya8nh6grbdps7gr7aa0rbmj7xprs00qjrkazsyzak4jn829l14z"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -147646,6 +148126,28 @@ self: { mainProgram = "hkgr"; }) {}; + "hkgr_0_4_3_2" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd-args, simple-prompt, typed-process + , xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.4.3.2"; + sha256 = "1c87hpd4p4mq3cx5m52c7hkwp18f5klkkfx342q2zmkks97lf1zb"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal + simple-cmd-args simple-prompt typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hkgr"; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -148668,8 +149170,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.3.0.0"; - sha256 = "0sblh25z3d8y3sn3mz5bxwk4jcshavc40xb8q3qyhdy96ab93g48"; + version = "2.4.0.0"; + sha256 = "0w3hk0cnrj7llchfrr3zdqh8m3bfz8xkax6r6a6vr3gcmyl7cwim"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -148702,8 +149204,8 @@ self: { }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.3.0.0"; - sha256 = "1lx59xyx867zak74a58z049061k9mzjdvvxcb824xs4hf1kr6cxm"; + version = "2.4.0.0"; + sha256 = "1gv3jb6i7q2bwi6fzxl7gc9rjkws924l7nybkaj8m2zjzpchqqvr"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl process-extras text transformers @@ -148722,8 +149224,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.3.0.0"; - sha256 = "1qqr6c4xdyjhsnpsv3f7hxbn2hx2qsj4mlipfr1g3rijy0qjbj6l"; + version = "2.4.0.0"; + sha256 = "17mmf5dsgsi08gvv6lalg2w92vsb6vx0vrl5n905wvngij3vydr3"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -148746,8 +149248,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.3.0.0"; - sha256 = "0283jv1kj63lj8npbi6k91f17sql2g9hnza98cnnrj620ic9ils1"; + version = "2.4.0.0"; + sha256 = "03zjkx2i89yn5xlw4y8vdm8b7l40y04g0shck4cl9vj7sixfbpl0"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -148767,8 +149269,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.3.0.0"; - sha256 = "18zals4rhx2z4dkkhz1ml6v3z53z3n4p1v66kgnxs5i4zvw282av"; + version = "2.4.0.0"; + sha256 = "1hz96bklyzhs625hhyzs3vzq2a5rvvdik22ijz3ixd7wgp2nqw18"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -148788,8 +149290,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.3.0.0"; - sha256 = "10fr3vxw4scbpkwv32p9w2vd2k87ilvwwfm02wgh8gcxfzss53fp"; + version = "2.4.0.0"; + sha256 = "1qk332msaj7lhin5dc8fyc319ls74i1f5mac118bhsz8ikrsdd64"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -148810,8 +149312,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.3.0.0"; - sha256 = "1pjq44mwv6q5vhj8k6i6jpklc9q69calavzj9vwvzri1zx2yv51b"; + version = "2.4.0.0"; + sha256 = "0lif9fg273i84w0nxslq2c8x62p5i8ymff1nhdqhmqac391agjka"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -148836,8 +149338,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.3.0.0"; - sha256 = "0yqpi8v4g5n6081ymfj37sk58x4c68zbxh84v07cbvr2nm51xi0x"; + version = "2.4.0.0"; + sha256 = "0qqhbwwj66ysgnfnl7fahv9mhfxxj46p37633hn142fhzr8vmp51"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -148878,8 +149380,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.3.0.0"; - sha256 = "1pshx1s29zv6k70rimvfdd1cz1yrs1j0206p6ndlyn6cv28vai7y"; + version = "2.4.0.0"; + sha256 = "0vd04sym8490briy8fpmbqy49vp70zw5c3r41kc9d65pglj8ph2y"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -148897,8 +149399,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.3.0.0"; - sha256 = "0lki1db4dmvky50k5k61yskfmyqmrph1lxjfwb31pg3rjiiasgqi"; + version = "2.4.0.0"; + sha256 = "175whhrpngi1pi86xb2rkgbnv9kd8gwwy6d80xc0jrx62nv6q0na"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -148918,8 +149420,8 @@ self: { }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.3.0.0"; - sha256 = "1f14nh9wjs35wljhrgssqm124gl4ilhxwn51fg5kbh15w6pqz1w9"; + version = "2.4.0.0"; + sha256 = "165c7knyr926ypcsyq3yafmahzn6hcnk0a6j3n0nx24wmv1912ww"; libraryHaskellDepends = [ aeson base containers ghc ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148937,8 +149439,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.3.0.0"; - sha256 = "09jld74jb7k3bs4hq3jq0v4lmk8h28pqcynpxmkp0yy86hfyn6q7"; + version = "2.4.0.0"; + sha256 = "1pj61iximld14qkbjk4icbxrnnys7gmq03y4whr9qxdh93ij7b0q"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -148954,8 +149456,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.3.0.0"; - sha256 = "1qpxay22ssipnzp32sqv76iaij13lxd8bdn4zj0qflrm25m90jzz"; + version = "2.4.0.0"; + sha256 = "113xfdv9f83z5sbcra6065j2snhf6h964858rcj1xw6jb5sjhfrb"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -148977,8 +149479,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.3.0.0"; - sha256 = "1l6kj9kp40ii8sfqsbi6mz2q8x6zp1076apdhy7d6fblrkv06ch0"; + version = "2.4.0.0"; + sha256 = "1hhvgw8k216m1cw50q5lsgl0zm5a6bp18ycpmpi4nwggazzr3hpj"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -149000,8 +149502,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.3.0.0"; - sha256 = "0vhzdvmk8s73m0z667dk3ryd6rdfzz96g6872q645mdhs2hqc0zg"; + version = "2.4.0.0"; + sha256 = "0h9sf9416mg2wrgq1jmwjbm1bm9hav1qp6jn1imhlwg59ck99j25"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -149040,8 +149542,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.3.0.0"; - sha256 = "013vl2wrr73gzp8cswvzcis4j32a0s2zdda8nwy47k0qkmrdqxym"; + version = "2.4.0.0"; + sha256 = "136fjmsm6anjxp30ysii0n63fz895k273xwn6i85s6vl3bvlyvxk"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -149064,8 +149566,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.3.0.0"; - sha256 = "10x7i61pk8j9jc1l83rnp5nhxcd54dpd4kllz9gyvgxz4kvwmddy"; + version = "2.4.0.0"; + sha256 = "01mj0g5nghhkbhannvh45rsxnb0sffdhx6ly98im4y19xmx50gkr"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -149082,8 +149584,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.3.0.0"; - sha256 = "0cxw2bmdlfr97vj2jgcs714pa94iw96p8xa07i8ahv6fpfc3j8rw"; + version = "2.4.0.0"; + sha256 = "0xi6qds51ds6z2l6h53d16krjc19wibcpkbxhb9v6ar0fdffbnvx"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl ormolu process-extras text transformers @@ -149105,8 +149607,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.3.0.0"; - sha256 = "1g92q71a4538l43c754q44xds6yg8sl7y8r7m3qrza664hs68wyl"; + version = "2.4.0.0"; + sha256 = "02frs42fx0snvwld950yk039c7m5m66fgz92rpkhbrnm225i0084"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -149131,8 +149633,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.3.0.0"; - sha256 = "1q5s8l8z007li3nbk653vd3k4wjgr92yrl16ly42pnrabwwffy77"; + version = "2.4.0.0"; + sha256 = "1yqnxsh9n5dk1kky5j36sm6lsb1zvk5r28mb3p99a9yvhcqp0zqy"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -149158,8 +149660,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.3.0.0"; - sha256 = "0lxh2ynfdx78x34a2mp9qsz2kdp6hyqqjn776mbsmxz26h9i94m8"; + version = "2.4.0.0"; + sha256 = "04cy5530227m1hr62h76w7918315sxq8iqvhd9igllwh3ackyx9j"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -149178,8 +149680,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.3.0.0"; - sha256 = "0mxd9zwsyf322lzlixs6956zhpbf9k7idvrzczfwij0jga7dppg9"; + version = "2.4.0.0"; + sha256 = "1zianxwdvbm49s9bvzk0wji4i2zyy36i5g9isdzv70hw5rl82jvx"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -149201,8 +149703,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.3.0.0"; - sha256 = "1ywgikx5r29q9nzhk625j5q2x7bn0ss1n4xkaj79665qnyhn98kh"; + version = "2.4.0.0"; + sha256 = "02s6n5wy46kfsy91vsfkk92qi23ji525n7g5f3nbnvmmpvd4kn8y"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -149249,8 +149751,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.3.0.0"; - sha256 = "0c4g8mzr17lp1cmhgcfw507wmmh4xi1qrqaldf0qxxd232396a43"; + version = "2.4.0.0"; + sha256 = "0ydnrmxq5ix0ly0mwsl3nxxrbwr6r975fcdw7cwz0bmyrma48w3h"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -149272,8 +149774,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.3.0.0"; - sha256 = "0345q4jxbp8vabsa8qby5bmqx3qbi55kvjwj5fzg431f4m75lsqc"; + version = "2.4.0.0"; + sha256 = "15llh584scavr6snr8bjc8kp8dz7vyh3vclsz2pzpkdcbr8ifhri"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -149321,8 +149823,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.3.0.0"; - sha256 = "1ar4j6r258mbmapnfsc8rwpclrcp9s4an1lgnh9jnjcn15ia5zyd"; + version = "2.4.0.0"; + sha256 = "0d42bjq4iyk5376rg4s97rv8j19y6cc9w1s7i0qm8zcbkp8vkgmc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -149354,8 +149856,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.3.0.0"; - sha256 = "08rq3i6d089vfnhmpj1nlfy3nmdxxna1gmmd4kkqyv7rxqdgka39"; + version = "2.4.0.0"; + sha256 = "0dz6wmj9qdccdhpdz4qa8c68a8hx8p6h9ycnj6fg2yihg9j33qqb"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -149386,8 +149888,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.3.0.0"; - sha256 = "1pak619y3s4mdachcqb8zbcczxxgfx35l61d2n5d2dq9n4fyhjjj"; + version = "2.4.0.0"; + sha256 = "0flb9sjaf3pbyr23a4399ygvf8ii692w9axbskfx9mwqndgc1jlw"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -152835,14 +153337,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_1_0" = callPackage + "hpc-codecov_0_4_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.1.0"; - sha256 = "1bvc7n19bqq1g1gw555yz2l13rl6372rxd4p0lfrxhxc523gkmly"; + version = "0.4.2.0"; + sha256 = "1vfx7x9w72lca9zv489fb5h0jqc50ijmikjij6hkb3flbyskdzqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153538,6 +154040,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "hreader_1_1_1" = callPackage + ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl + , tagged, transformers, transformers-base + }: + mkDerivation { + pname = "hreader"; + version = "1.1.1"; + sha256 = "0am8kyy046l9laqxx60nm3v6haz00wbrs1naxg0yq8z8yqcn4qvv"; + libraryHaskellDepends = [ + base exceptions hset mmorph monad-control mtl tagged transformers + transformers-base + ]; + testHaskellDepends = [ base hset transformers-base ]; + description = "Generalization of MonadReader and ReaderT using hset"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hreader-lens" = callPackage ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action , profunctors @@ -154825,19 +155345,20 @@ self: { "hs-samtools" = callPackage ({ mkDerivation, ascii, attoparsec, base, bitvec, bytestring - , containers, crypton, generic-deriving, hspec, pcre-heavy - , regex-tdfa, streamly, streamly-bytestring, streamly-core + , containers, crypton, generic-deriving, hspec, parser-combinators + , pcre-heavy, regex-tdfa, streamly, streamly-bytestring + , streamly-core }: mkDerivation { pname = "hs-samtools"; - version = "0.6.0.1"; - sha256 = "0i3klgjjai1ax8nyijb3qrach93d6r2pmsxbf2vq56cg3d8j3ym7"; + version = "0.7.0.0"; + sha256 = "0fkvq2bg8q0ikg8hwb4lmdjss7jis9ghwnykds6rpa3mlkg22m5g"; libraryHaskellDepends = [ ascii attoparsec base bitvec bytestring containers crypton - generic-deriving pcre-heavy regex-tdfa streamly streamly-bytestring - streamly-core + generic-deriving parser-combinators pcre-heavy regex-tdfa streamly + streamly-bytestring streamly-core ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base bytestring containers hspec ]; description = "Read and write SAM, BAM, and CRAM files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -157745,14 +158266,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_5" = callPackage + "hspec_2_11_6" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.5"; - sha256 = "1jk5pfjx8g3dd8sz0bzkbx6klhg644vsmwh6kjdlsr5p757mczpy"; + version = "2.11.6"; + sha256 = "0czsm39vizhm8fjr09sb8652haxb0f81zprr8k7yjpk1kyq5582p"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -157767,8 +158288,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.5"; - sha256 = "1r8mz2awqk3l3i8cwrqhs0pr919sqxvng4lr8lc33w1lwixlp41x"; + version = "2.11.6"; + sha256 = "0il6vaxkw7d6shjvhj0dp6fhrixwh4aspcqpa0myf8m4vmlp9alb"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -157894,7 +158415,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_5" = callPackage + "hspec-core_2_11_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -157903,8 +158424,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.5"; - sha256 = "1hr9fvl21pfgy534qwj7xld7i0zmdg90w9anqif9snlwgjkrwzhw"; + version = "2.11.6"; + sha256 = "1j6pzpmkxrjv7ady2vlf7bx9ayphm2l3bls3fycs9h1lv3k0cni3"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -157987,14 +158508,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_5" = callPackage + "hspec-discover_2_11_6" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.5"; - sha256 = "13c8ibmv72izjy5zi2pqnygk5hgb3cwwnzxf00ndp0gd5w3dpvgd"; + version = "2.11.6"; + sha256 = "0i87w82gfzkl0dzcg1mvw8jr7ccqd25gq55zbqala8fqanplp7xp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -158045,6 +158566,8 @@ self: { pname = "hspec-expectations-json"; version = "1.0.2.0"; sha256 = "0vl5brjbvjdbv2i4zq2ww7l0gg11l0ssmr4m7xqdn7as2798q1q1"; + revision = "2"; + editedCabalFile = "085mc79w056c7jinmldav7d1916y61x3p2ikb2api8symaa377n3"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -158386,7 +158909,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_5" = callPackage + "hspec-meta_2_11_6" = 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 @@ -158394,8 +158917,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.5"; - sha256 = "12kxv36xwrqnd9h7jrs9sn769zymip9908j9723hphkrqa0sy941"; + version = "2.11.6"; + sha256 = "0vn0q7a2r1j8ixlwls8q55gyihv9398wga9804qy51f33y345zqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160518,6 +161041,8 @@ self: { pname = "http-api-data"; version = "0.6"; sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; + revision = "1"; + editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -160580,6 +161105,8 @@ self: { pname = "http-client"; version = "0.7.14"; sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; + revision = "1"; + editedCabalFile = "1w1blf2r8riwibv79rcfxij7j60x0sdiqyf7nr5i5rjqbb0sh2k1"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -161712,6 +162239,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-streams_0_8_9_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson + , base, base64-bytestring, blaze-builder, bytestring + , case-insensitive, directory, filepath, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, random, snap-core + , snap-server, text, transformers, unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.9.9"; + sha256 = "1yvabr0bh7b5pbklhq6aw8pam2zasp77g38fakgjnpgb76s4mwqv"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring + blaze-builder bytestring case-insensitive directory filepath + HsOpenSSL http-common io-streams mtl network network-uri + openssl-streams text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams random snap-core snap-server + text transformers unordered-containers + ]; + description = "An HTTP client using io-streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -161851,7 +162408,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_4_2_0" = callPackage + "http2_4_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -161861,8 +162418,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "4.2.0"; - sha256 = "1jlxzlayfzfh0bypalg2p97nvjygychgv28fvwjnvgp0saqj79m3"; + version = "4.2.2"; + sha256 = "0kdd4r52jfh1j8jfjcs1mshfasfk1m2ffrcrxxj6cdi7sgxm2377"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163382,8 +163939,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.1"; sha256 = "1ilgqrx8jvgvmns99d74qz8c11ifyrccbvszfzwwhk28fhai0k7s"; - revision = "3"; - editedCabalFile = "129bnprzh8nglbi5x8i5dlc4v5qr7cqg6bajy6id1168r26ciwcq"; + revision = "4"; + editedCabalFile = "0fwdbd7m7b9743y6w1ci3m7m0bgw7w0r0h7pvn2xrhvyjvp9rjqh"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -168316,17 +168873,6 @@ self: { }) {}; "indexed-traversable" = callPackage - ({ mkDerivation, array, base, containers, transformers }: - mkDerivation { - pname = "indexed-traversable"; - version = "0.1.2.1"; - sha256 = "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"; - libraryHaskellDepends = [ array base containers transformers ]; - description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable_0_1_3" = callPackage ({ mkDerivation, array, base, containers, foldable1-classes-compat , transformers }: @@ -168339,7 +168885,6 @@ self: { ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indexed-traversable-instances" = callPackage @@ -169691,6 +170236,8 @@ self: { pname = "integer-conversion"; version = "0.1.0.1"; sha256 = "0fbgqizla2jdchnii1lqp2yla3lkm04w4qn5laxmhm5n3k7p1b10"; + revision = "1"; + editedCabalFile = "055v4jxls9ajf3jmi04wzra9iapfpg7jn93cbmdh2grj6lkahmqf"; libraryHaskellDepends = [ base bytestring primitive text ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck text @@ -170367,22 +170914,25 @@ self: { }) {}; "interval-patterns" = callPackage - ({ mkDerivation, base, containers, groups, heaps, hspec, lattices - , QuickCheck, semirings, time, time-compat + ({ mkDerivation, base, containers, deepseq, groups, hashable, heaps + , hspec, lattices, QuickCheck, semirings, time, time-compat }: mkDerivation { pname = "interval-patterns"; - version = "0.7.0.3"; - sha256 = "16521q6jb0lxncsy3wav6p5jfp8jv1sw0simlyfjx0nl6gjpbz40"; + version = "0.7.2"; + sha256 = "1cwv7yfc64zffa05mq300bb6zwdkgk85mjh10dzgnj1g1rd5z593"; libraryHaskellDepends = [ - base containers groups heaps lattices semirings time time-compat + base containers deepseq groups hashable heaps lattices semirings + time time-compat ]; testHaskellDepends = [ - base containers groups heaps hspec lattices QuickCheck semirings - time time-compat + base containers deepseq groups hashable heaps hspec lattices + QuickCheck semirings time time-compat ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interval-tree-clock" = callPackage @@ -170918,8 +171468,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "2"; - editedCabalFile = "12q3nhd4wqyv1m7wvzvs5a8yyarcjdrvdhmb4c5hx3zrs5l7sflw"; + revision = "3"; + editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -171097,6 +171647,8 @@ self: { pname = "ip"; version = "1.7.7"; sha256 = "0yhhmy51s2sbm1qlbx2z9h6bizswi2ck15fxxl76vc3dzbd7gj27"; + revision = "1"; + editedCabalFile = "17b89zp1qvfk9vyhh7hv5c4n276ciqpap2s2rxd1c11ykb010c0y"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -172130,24 +172682,45 @@ self: { "isomorphism-class" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.9"; - sha256 = "1d0vgmabjyiqpkgrn1hq6a77nyf7imi50ki9gq8a528l2k7sifig"; + version = "0.1.0.10"; + sha256 = "1017zzav1s00jsxjv419zcrm5i334n9zz42isz6b85hiixqm848v"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers hashable primitive QuickCheck - quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + }) {}; + + "isomorphism-class_0_1_0_11" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.11"; + sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text unordered-containers vector ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector + ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "isotope" = callPackage @@ -173142,8 +173715,8 @@ self: { }: mkDerivation { pname = "jacobi-elliptic"; - version = "0.1.1.0"; - sha256 = "1vwfs1br5p35zjw58zpziakda48lxmwsmvl554y10djkby25g71k"; + version = "0.1.3.0"; + sha256 = "13inf9szcf4bl81ddd5x2jppkhssydg8szihpnwsl8gs4lml0jdg"; libraryHaskellDepends = [ base elliptic-integrals jacobi-theta ]; testHaskellDepends = [ base elliptic-integrals tasty tasty-hunit ]; description = "Neville Theta Functions and Jacobi Elliptic Functions"; @@ -173168,8 +173741,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.2.0"; - sha256 = "1wc16b61vbvh2bigcva11qbjpqg7kwvzgc0znxzsilywrl3iv1nf"; + version = "0.2.2.1"; + sha256 = "0gpyaqrfajcxlgxqjd1kk30a571ini6ikw6n6l2ryzw2971z127n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -173563,7 +174136,9 @@ self: { executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "javascript-extras-test"; + broken = true; }) {}; "javasf" = callPackage @@ -175238,6 +175813,8 @@ self: { pname = "json-query"; version = "0.2.2.0"; sha256 = "1k0rxrki8qa6gx0kqrhn9k98pn8hz3xg4kxn045r920bacfgsvi2"; + revision = "1"; + editedCabalFile = "1h99j6lsjp4dwmyvkav1j25y4glrsk8xny2rsp81bjblhgi5kfci"; libraryHaskellDepends = [ array-chunks base bytebuild bytestring contiguous json-syntax primitive primitive-unlifted profunctors scientific-notation @@ -175537,16 +176114,16 @@ self: { , contiguous, gauge, natural-arithmetic, neat-interpolation , primitive, QuickCheck, run-st, scientific, scientific-notation , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , text-short, vector, word-compat, zigzag + , text-short, transformers, vector, word-compat, zigzag }: mkDerivation { pname = "json-syntax"; - version = "0.2.6.1"; - sha256 = "0zhmzpxcv4jybw669kaz93am46l4da3v0sa14avmvw7z8yd08mqm"; + version = "0.2.7.0"; + sha256 = "07502z9i8y7z87ps6m0vz0wprrlwkyniwwlgmbr403kjihn1fj3l"; libraryHaskellDepends = [ array-builder array-chunks base bytebuild byteslice bytesmith bytestring contiguous natural-arithmetic primitive run-st - scientific-notation text text-short word-compat zigzag + scientific-notation text text-short transformers word-compat zigzag ]; testHaskellDepends = [ aeson array-chunks base bytebuild byteslice bytestring containers @@ -176881,10 +177458,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4.1"; - sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "9"; - editedCabalFile = "036whnk5gqw3pgzld7hjdam12ffbhqpwcxlbbgy58hlnajgmfa7a"; + version = "0.4.2"; + sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -177562,6 +178137,8 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keccak" = callPackage @@ -178587,7 +179164,7 @@ self: { "keystore" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools , array, asn1-encoding, asn1-types, base, base64-bytestring - , byteable, bytestring, containers, crypto-pubkey-types, cryptonite + , byteable, bytestring, containers, crypto-pubkey-types, crypton , directory, filepath, lens, memory, mtl, old-locale , optparse-applicative, pbkdf, process, raw-strings-qq, regex , regex-base, regex-tdfa, safe, setenv, text, time @@ -178595,15 +179172,15 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.9.0.0"; - sha256 = "1wv9rsqz80n70z2fn2s7j4scxcx4dsdr54b8l29232vqzjyqnaxr"; + version = "0.9.0.2"; + sha256 = "07mhnd22b4lyhls9criaxw62scbp71qznmpnxpnz64lwnm5iljmb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint api-tools array asn1-encoding asn1-types base base64-bytestring byteable bytestring containers - crypto-pubkey-types cryptonite directory filepath lens memory mtl + crypto-pubkey-types crypton directory filepath lens memory mtl old-locale optparse-applicative pbkdf regex regex-base regex-tdfa safe setenv text time unordered-containers vector ]; @@ -178682,8 +179259,8 @@ self: { ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.1.0"; - sha256 = "0jwm1f26c89715vm8z5mwr8dzrgj7vjp4b0drhrivzcp381v28jb"; + version = "1.0.1.1"; + sha256 = "1rvjwq765wy99j60x7d5v7zyq8hf52gfjiypc37a9r7gx1y4hir9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; @@ -178707,12 +179284,10 @@ self: { ({ mkDerivation, base, ki, unliftio-core }: mkDerivation { pname = "ki-unlifted"; - version = "1.0.0.1"; - sha256 = "1nfa6g2qi791aqg0whdf02pzng01wvbcxvzy6yf5sa20c6fsqn4b"; - revision = "1"; - editedCabalFile = "0va6m6hpj1hqhlfrfy6n4gipgcq9m03193xq5pbq61fr8ixn64l7"; + version = "1.0.0.2"; + sha256 = "11b4jm161znazwf2pn3qdn4dbz1g5a12dvhm03ddx6lrha7yv1xv"; libraryHaskellDepends = [ base ki unliftio-core ]; - description = "A lightweight structured-concurrency library"; + description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; }) {}; @@ -179050,20 +179625,23 @@ self: { }) {}; "kmonad" = callPackage - ({ mkDerivation, base, cereal, lens, megaparsec, mtl - , optparse-applicative, resourcet, rio, time, unix, unliftio + ({ mkDerivation, base, cereal, hspec, hspec-discover, lens + , megaparsec, mtl, optparse-applicative, resourcet, rio + , template-haskell, time, unix, unliftio }: mkDerivation { pname = "kmonad"; - version = "0.4.1"; - sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + version = "0.4.2"; + sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cereal lens megaparsec mtl optparse-applicative resourcet rio - time unix unliftio + template-haskell time unix unliftio ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -179094,6 +179672,8 @@ self: { pname = "knead"; version = "1.0.1"; sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; + revision = "1"; + editedCabalFile = "1h7w7y5s5mx7pxgmff45pfhh7cnxg9w2bv8787s80cfnnypwv3as"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -179261,8 +179841,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "1.1"; - sha256 = "0xm6qxfxfl9qf8mmsns783mvwhx3p81h2iwak6kww8j5lsdv2n6w"; + version = "1.1.1"; + sha256 = "0hrvbcsc15q9ks5zb7s1fhb3skfcsf11ihhni6baszxkw27jqspi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183018,6 +183598,8 @@ self: { pname = "lattices"; version = "2.2"; sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; + revision = "1"; + editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; libraryHaskellDepends = [ base base-compat containers deepseq foldable1-classes-compat hashable integer-logarithms QuickCheck tagged transformers @@ -186702,6 +187284,8 @@ self: { pname = "lifted-async"; version = "0.10.2.4"; sha256 = "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv"; + revision = "2"; + editedCabalFile = "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -187326,8 +187910,8 @@ self: { pname = "linear-base"; version = "0.3.1"; sha256 = "1gm8bwyi39x5x29xb6nq13x9x9p30vm29s11k4pkcql70sj4pv0h"; - revision = "1"; - editedCabalFile = "153nkw2i7n22xzfj8q2xmzsh77pr7pay8v3gc1xli491qmsc0fcd"; + revision = "2"; + editedCabalFile = "0bfpjjr2y16h2x3gphsljgzcqrlwbmrxxqsikgn2idwy73pvd32l"; libraryHaskellDepends = [ base containers ghc-prim hashable linear-generics primitive storable-tuple text transformers vector @@ -187345,6 +187929,35 @@ self: { license = lib.licenses.mit; }) {}; + "linear-base_0_4_0" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable + , hashtables, hedgehog, inspection-testing, linear-generics, mmorph + , MonadRandom, primitive, random, random-shuffle, storable-tuple + , tasty, tasty-bench, tasty-hedgehog, tasty-inspection-testing + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.4.0"; + sha256 = "092xnbn29829zz1nq96h2fcw3qpkanzrhw09cjs90f19xhcs1vxw"; + libraryHaskellDepends = [ + base containers ghc-prim hashable linear-generics primitive + storable-tuple text transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog inspection-testing linear-generics mmorph + storable-tuple tasty tasty-hedgehog tasty-inspection-testing text + vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq hashable hashtables MonadRandom random + random-shuffle tasty-bench unordered-containers vector + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -188379,14 +188992,15 @@ self: { , containers, deepseq, directory, fgl, filepath, git, hashable , intern, lens-family, megaparsec, mtl, nettools , optparse-applicative, parallel, parser-combinators, pretty - , process, rest-rewrite, stm, store, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-rerun, text - , transformers, unordered-containers, vector, z3 + , process, rest-rewrite, smtlib-backends, smtlib-backends-process + , stm, store, syb, tagged, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, transformers, typed-process + , unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.0.2.1"; - sha256 = "1gq867m9b48381zi3m5xari9j34xva4gchajahbpi4fvy54gp6h3"; + version = "0.9.2.5"; + sha256 = "0i9487xz1cfmn3nv58wlm685ljvqq1iqfyz1rkx549wa5h4zmdjq"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -188394,15 +189008,16 @@ self: { aeson ansi-terminal array ascii-progress async attoparsec base binary boxes bytestring cereal cmdargs containers deepseq directory fgl filepath hashable intern lens-family megaparsec mtl parallel - parser-combinators pretty process rest-rewrite stm store syb text - transformers unordered-containers vector + parser-combinators pretty process rest-rewrite smtlib-backends + smtlib-backends-process stm store syb text transformers + typed-process unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers directory filepath hashable mtl optparse-applicative process stm tagged tasty tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun text transformers - unordered-containers + typed-process unordered-containers ]; testSystemDepends = [ git nettools z3 ]; doCheck = false; @@ -188429,34 +189044,34 @@ self: { }) {}; "liquid-parallel" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, parallel + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , parallel }: mkDerivation { pname = "liquid-parallel"; - version = "3.2.2.0.1"; - sha256 = "0c9qf1achk9n6l6rlncsm7harmdxph90by61lmjk3fw251c9ib03"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; + version = "3.2.2.0.2"; + sha256 = "0a1frfdklhhfwlzrpxcrx1jnqanhzs2qrqm6xlyahnknbwhhc51g"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquid-platform" = callPackage - ({ mkDerivation, cmdargs, filepath, liquid-base, liquid-bytestring - , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell + ({ mkDerivation, base, cmdargs, containers, filepath + , liquid-prelude, liquid-vector, liquidhaskell, liquidhaskell-boot , process }: mkDerivation { pname = "liquid-platform"; - version = "0.9.0.2"; - sha256 = "1y2vwjs00k786diwmzljrzwaj3nnmsm4kysq49hdzl9vkfx8nvca"; + version = "0.9.2.5"; + sha256 = "149bbnyhqmhcdpxbhs1h5hypc2xg4yjlj8j9wxcjwfdfq5bw8h7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - cmdargs filepath liquid-base liquid-bytestring liquid-containers - liquid-prelude liquid-vector liquidhaskell process + base cmdargs containers filepath liquid-prelude liquid-vector + liquidhaskell liquidhaskell-boot process ]; description = "A battery-included platform for LiquidHaskell"; license = lib.licenses.bsd3; @@ -188465,16 +189080,16 @@ self: { }) {}; "liquid-prelude" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, liquid-base - , liquidhaskell + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell, liquidhaskell-boot }: mkDerivation { pname = "liquid-prelude"; - version = "0.9.0.2"; - sha256 = "176iwwsnx80x716qym2i6hjyq7v38lq2nkwnmhdb1v3c5wrp4z67"; - setupHaskellDepends = [ base Cabal liquidhaskell ]; + version = "0.9.2.5"; + sha256 = "1333z82xycs4mzbayj7n1ah4bd6mdz7pasw7g8gvcq0gqakqlxzd"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - bytestring containers liquid-base liquidhaskell + base bytestring containers ghc-prim liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = lib.licenses.bsd3; @@ -188482,59 +189097,70 @@ self: { }) {}; "liquid-vector" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , vector + }: mkDerivation { pname = "liquid-vector"; - version = "0.12.3.1"; - sha256 = "15v4prdf35b11iym05dmr3n58i260zk69yzf31cha7rqbgr5lhd7"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; + version = "0.12.3.1.2"; + sha256 = "1pc05sr1w827k7sv7x3kdrvssy4zbq4k0dn3fhd9jp62sciyf5ia"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquidhaskell" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell-boot, z3 + }: + mkDerivation { + pname = "liquidhaskell"; + version = "0.9.2.5.0"; + sha256 = "1a508khibgy94z9fk91z22wl7qqdw8l4wcfcjxk0z7z7f05llrim"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ + base bytestring containers ghc-prim liquidhaskell-boot + ]; + testSystemDepends = [ z3 ]; + description = "Liquid Types for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) z3;}; + + "liquidhaskell-boot" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal , cmdargs, containers, data-default, data-fix, deepseq, Diff , directory, exceptions, extra, filepath, fingertree, free, ghc , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable - , hscolour, liquid-fixpoint, megaparsec, mtl, optics - , optparse-applicative, pretty, process, recursion-schemes, split - , syb, tasty, tasty-ant-xml, tasty-hunit, template-haskell - , temporary, text, th-compat, time, transformers - , unordered-containers, vector, z3 + , hscolour, liquid-fixpoint, megaparsec, mtl, optparse-applicative + , pretty, recursion-schemes, split, syb, tasty, tasty-ant-xml + , tasty-hunit, template-haskell, temporary, text, th-compat, time + , transformers, unordered-containers, vector }: mkDerivation { - pname = "liquidhaskell"; - version = "0.9.0.2.1"; - sha256 = "174bazw76hrn3rlvcmsag87rv66r9vwm6008hw540gjvj2g1w0z4"; - revision = "1"; - editedCabalFile = "1ycl8vg7nzslkvsiimfv67fa095cgkzpzxila6wpnnsmf6d9m06z"; - isLibrary = true; - isExecutable = true; + pname = "liquidhaskell-boot"; + version = "0.9.2.5.0"; + sha256 = "10k8pisygfdy23i2zb538rl7yf3gac4wxa550dsqnzkmkfcr82yz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring Cabal cereal cmdargs containers data-default data-fix deepseq Diff directory exceptions extra filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash - gitrev hashable hscolour liquid-fixpoint megaparsec mtl optics + gitrev hashable hscolour liquid-fixpoint megaparsec mtl optparse-applicative pretty recursion-schemes split syb template-haskell temporary text th-compat time transformers unordered-containers vector ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory extra filepath ghc liquid-fixpoint megaparsec - process syb tasty tasty-ant-xml tasty-hunit text + base directory filepath ghc ghc-paths liquid-fixpoint megaparsec + syb tasty tasty-ant-xml tasty-hunit time ]; - testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "liquid"; - }) {inherit (pkgs) z3;}; + }) {}; "liquidhaskell-cabal" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: @@ -188729,8 +189355,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.5.6"; - sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; + version = "1.0.5.7"; + sha256 = "0ikbgml3ky1pzahqxisi17g2j5ya2ps75cq96cv9cz4cf9kqk4j0"; libraryHaskellDepends = [ base foldl logict mmorph monad-control mtl transformers transformers-base @@ -189109,8 +189735,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "4"; - editedCabalFile = "04pqdsvjznw5kbnmka2xq32qfc6qlsq7g6a9gi3k0fbg8zj5s057"; + revision = "5"; + editedCabalFile = "16vs060sfdbkmrl8p9cvmn0rl7zwr4l7lvm9lwvmnl0vww1f41r1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189398,6 +190024,8 @@ self: { pname = "llvm-dsl"; version = "0.1.1"; sha256 = "15ad2kv7d4hr732zlxk6f2faw76xavaynpi2d18kch41x1giivxv"; + revision = "1"; + editedCabalFile = "0iq6v0z6g7lzg8pnijanphcj51fhbvishs5vzylhjvhjikfcv9lc"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat storable-enum storable-record tfp transformers unsafe utility-ht @@ -189435,8 +190063,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.11"; - sha256 = "1ck6cama0l89rgjcqhnasvzzy1pacr9h2z6v32pi7xci3h7ijhy2"; + version = "0.12"; + sha256 = "0syd18037lg1g1yg4nk5pmmwwzgxzrlgg9jzli47q5v346dk0mv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189458,8 +190086,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "14.0"; - sha256 = "13x27wm4zhiwi1khb4iyp2fj5rmdfzcb4bk9m1r975adpmnwk537"; + version = "16.0"; + sha256 = "14cf6qhdq69ggx41259ih55g6z1vn0694wrh3s8m6f7adq990ra9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -189749,8 +190377,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.1.1"; - sha256 = "1qvxib55k0bw6rykl4c9551k50jia6m9pyhpshfs6lasvy4rs1gb"; + version = "16.0"; + sha256 = "1nscccmk0nf52p9r0af354p4n4vr1fbaym4x164wwwid7xc1x65g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191301,6 +191929,8 @@ self: { pname = "longboi"; version = "1.0.0"; sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; + revision = "1"; + editedCabalFile = "08ij5rlcj7c6w4gaqixd080v2j4p979r83irbdyma6djimfyvnb7"; libraryHaskellDepends = [ base ]; description = "Dependently-typed linked list implementation"; license = lib.licenses.mit; @@ -192651,8 +193281,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; - revision = "4"; - editedCabalFile = "0ij1wcciiplk381xzxr7xcnywfbh5caflffnvlzqmg8bz3j4xdcs"; + revision = "5"; + editedCabalFile = "01szqdkxgk00anqifx1xvnyim6j9lv02aqdshdbls376vi2nay0p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -195798,6 +196428,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "math-functions_0_3_4_3" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.4.3"; + sha256 = "0ri9vf9bcs4q8bj9451sjc4q5cfxc8bcjjx6wqgsdk3yx2sxb1jd"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector + ]; + testHaskellDepends = [ + base data-default-class deepseq erf primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector vector-th-unbox + ]; + benchmarkHaskellDepends = [ + base data-default-class random tasty-bench vector + ]; + description = "Collection of tools for numeric computations"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, bimap, containers, hspec , ilist, lens, linear, matrix, mtl, random, vector @@ -197311,6 +197965,8 @@ self: { pname = "megaparsec"; version = "9.5.0"; sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; + revision = "4"; + editedCabalFile = "0f6g05w18kn34rcjkxfdsg4sibxsz41p2xac7wfc9wqpr0l9kg55"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -197357,6 +198013,8 @@ self: { pname = "megaparsec-tests"; version = "9.5.0"; sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; + revision = "2"; + editedCabalFile = "1zh7ggvc1453b734mmc7yyd8f6qrr34bnvab0507l1nflml7w9bb"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -198065,25 +198723,26 @@ self: { }) {}; "mergeful-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeful, genvalidity-persistent, hspec, mergeful - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity, validity-persistent + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeful, genvalidity-persistent, genvalidity-sydtest + , mergeful, microlens, monad-logger, mtl, path, path-io, persistent + , persistent-sqlite, persistent-template, QuickCheck, sydtest + , sydtest-discover, text, validity, validity-persistent }: mkDerivation { pname = "mergeful-persistent"; - version = "0.1.0.0"; - sha256 = "13i2bajgxwmyr5w8qfswlpizhsajnnhgs96hav74sj5m5i6z0dpi"; + version = "0.3.0.1"; + sha256 = "1cbxikv2amab82fkqr78pwax9z8bh04ybjanif6nlfyrq598annc"; libraryHaskellDepends = [ base containers mergeful microlens mtl persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeful - genvalidity-persistent hspec mergeful monad-logger mtl path path-io - persistent persistent-sqlite persistent-template QuickCheck text - validity validity-persistent + base containers genvalidity genvalidity-mergeful + genvalidity-persistent genvalidity-sydtest mergeful monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity validity-persistent ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -198106,25 +198765,26 @@ self: { }) {}; "mergeless-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeless, genvalidity-persistent, hspec, mergeless - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeless, genvalidity-persistent + , genvalidity-sydtest, mergeless, microlens, monad-logger, mtl + , path, path-io, persistent, persistent-sqlite, persistent-template + , QuickCheck, sydtest, sydtest-discover, text, validity }: mkDerivation { pname = "mergeless-persistent"; - version = "0.1.0.0"; - sha256 = "05fazha6q5lmpagfazlrly7ms0p1jag9n6llwmr0zspx0raq35mb"; + version = "0.1.0.1"; + sha256 = "1m6nbkc43vjjavg9wqimb6ql98m70qy5nagz6l8gjc3icz8dmc00"; libraryHaskellDepends = [ base containers mergeless microlens persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeless - genvalidity-persistent hspec mergeless monad-logger mtl path - path-io persistent persistent-sqlite persistent-template QuickCheck - text validity + base containers genvalidity genvalidity-mergeless + genvalidity-persistent genvalidity-sydtest mergeless monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -198784,8 +199444,8 @@ self: { pname = "microaeson"; version = "0.1.0.1"; sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "7"; - editedCabalFile = "01skh5580zxf1032b25wm410jr52kaxq822jz6n568sfx90hmfl7"; + revision = "8"; + editedCabalFile = "1w9pm69vm0r3zkmcls3zd6b0vc3ifvsjmwj2wk7gc23pj4bwzwlb"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -198908,6 +199568,8 @@ self: { pname = "microlens"; version = "0.4.13.1"; sha256 = "1z6ph89sgdhgdf8sqaw9g978mlnvlc4k8y50pssaxxplizpanm0a"; + revision = "1"; + editedCabalFile = "07d5lm0p98aly7wfm1ishm8dy6ccgg2mklrxkgry9s3qblmnw9gw"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; @@ -198939,6 +199601,8 @@ self: { pname = "microlens-contra"; version = "0.1.0.3"; sha256 = "1jxm6shmvacbic6i6hask0kv89kramnk77pcxpv4gv4xydjsr88n"; + revision = "1"; + editedCabalFile = "086z6n3c606zmv1fxc9j2jhsvh1v7nszawklg1xddyzk9jgcyzpv"; libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = lib.licenses.bsd3; @@ -198963,8 +199627,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.14.1"; - sha256 = "1h6wcgv50mxqz09wkamqjgw90382a4m31mq7q57vmzmkl489nw2n"; + version = "0.4.14.2"; + sha256 = "17fdc5jpqlq3q61mf6qia7a18kqq4nfpbrv2j2n4a4cx62kcbraq"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -198980,6 +199644,8 @@ self: { pname = "microlens-mtl"; version = "0.2.0.3"; sha256 = "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd"; + revision = "1"; + editedCabalFile = "0xw3hjsfdg0hz12bk9yh2zqs2xi4jxaspwkd968ajxq13rmygxlj"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -198993,8 +199659,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.4.3.3"; - sha256 = "13s6m07whp3h05vqm2hz3qv5ai51ll6q4s3kf8nr3pif6wxqbisy"; + version = "0.4.3.4"; + sha256 = "01j7z0637wirp6y0a4zfzqaky0dmpn1c3y9vdq5hf5igycc1v6yh"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -199097,8 +199763,8 @@ self: { pname = "microstache"; version = "1.0.2.3"; sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; - revision = "2"; - editedCabalFile = "0rafypnzzxmxhbc3lyd8ylyfrygijipbgh267slzkwfa8hikd0nz"; + revision = "3"; + editedCabalFile = "0bl84aym5p31wlyqwh5vicyrdw3nvig65xxdlx4ql8hjr71l7mvi"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -199681,6 +200347,18 @@ self: { license = lib.licenses.mit; }) {}; + "mime-types_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.2.0"; + sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "min-max-pqueue" = callPackage ({ mkDerivation, base, containers, criterion, hedgehog , integer-logarithms, random @@ -201420,6 +202098,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; + revision = "1"; + editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -201816,8 +202496,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.1.1"; - sha256 = "13y8s9dargzd5vy6m36dq2pnr23fibnx6r19iz414qsdbizp3196"; + version = "1.2.0"; + sha256 = "0v65asbmndgp5ljzdizgrrhwwbf6ajqaaaky5v51ivic8csb1dfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201906,8 +202586,8 @@ self: { pname = "monad-chronicle"; version = "1.0.1"; sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "2"; - editedCabalFile = "1f0plhhr8n5bcki3fn0nbbsjb4jwydk6fhqqnmwrb0g0n3cvj1gz"; + revision = "3"; + editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -203255,19 +203935,17 @@ self: { }) {}; "monadic-bang" = callPackage - ({ mkDerivation, base, containers, exceptions, fused-effects, ghc - , ghc-boot, ghc-paths, transformers + ({ mkDerivation, base, containers, fused-effects, ghc, ghc-boot + , ghc-paths, transformers }: mkDerivation { pname = "monadic-bang"; - version = "0.1.1.0"; - sha256 = "143xi2yav13n28zppfrlk8xllm56ciw0lghbbdnafkf208szv91c"; + version = "0.2.1.0"; + sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; - testHaskellDepends = [ - base exceptions ghc ghc-boot ghc-paths transformers - ]; + testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; }) {}; @@ -203817,8 +204495,8 @@ self: { pname = "monoid-extras"; version = "0.6.2"; sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; - revision = "1"; - editedCabalFile = "1xl89p6qcir69qg0kn4443swl4kcgl3vm8dbfi86dgr5z6zvpxhc"; + revision = "2"; + editedCabalFile = "08ydfb0n886qzy940lfvyv1pcj51yhpa0kz6pwn7lm22fh1hb5pf"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -203876,8 +204554,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.4"; - sha256 = "1hg0vpm6nhdqxxpx9329gj135fqrfsw0kdlxd1ycfini69jsbxn6"; + version = "1.1.5"; + sha256 = "1knxn3qxn630lpc7nq6v4z5mysahs8w6hk29dnfkhgf7bc80ilrb"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -203913,6 +204591,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_2_4_1" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, primes, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.2.4.1"; + sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; + libraryHaskellDepends = [ + base bytestring commutative-semigroups containers primes text + vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -204074,26 +204774,29 @@ self: { }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , dbus, desktop-portal, directory, modern-uri, monomer - , monomer-hagrid, random, text + ({ mkDerivation, async, base, bytestring, c2hs, containers + , data-default-class, dbus, desktop-portal, directory, libpipewire + , libspa, modern-uri, monomer, monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.12.0"; - sha256 = "185vv9ihrjssncpkhfh7gchw6whx0ll951y7j4pznnn6s0b3k2yk"; + version = "0.0.13.2"; + sha256 = "1lklf9n1ck1yyyc73f36i495rgq2anxm33ghcmlssy8allpv1k8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring containers data-default-class dbus desktop-portal - directory modern-uri monomer monomer-hagrid random text + async base bytestring containers data-default-class dbus + desktop-portal directory modern-uri monomer monomer-hagrid random + text ]; + executablePkgconfigDepends = [ libpipewire libspa ]; + executableToolDepends = [ c2hs ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "monomer-flatpak-example"; - }) {}; + }) {libpipewire = null; libspa = null;}; "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default @@ -204267,6 +204970,8 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "Efficient search weighted by an ordered monoid with monus"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monzo" = callPackage @@ -205292,6 +205997,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; "mpi-hs_0_7_3_0" = callPackage @@ -205313,6 +206019,7 @@ self: { license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sheepforce ]; }) {ompi = null;}; "mpi-hs-binary" = callPackage @@ -205331,6 +206038,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-cereal" = callPackage @@ -205349,6 +206057,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-store" = callPackage @@ -205367,6 +206076,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mplayer-spot" = callPackage @@ -207601,6 +208311,8 @@ self: { pname = "murmur-hash"; version = "0.1.0.10"; sha256 = "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9"; + revision = "1"; + editedCabalFile = "18wlx3hsba3kvpa1z95dz0xglr97lf62irlr6wg6i0613br58sh3"; libraryHaskellDepends = [ base bytestring ]; description = "MurmurHash2 implementation for Haskell"; license = lib.licenses.bsd3; @@ -208763,6 +209475,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mysql-json-table" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, mysql + , mysql-simple + }: + mkDerivation { + pname = "mysql-json-table"; + version = "0.1.0.0"; + sha256 = "1mc4xjgvwj1h687f4rh8sy5q102rg17ppszfyph8h0hkahy6nqxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit mysql mysql-simple + ]; + executableHaskellDepends = [ base conduit mysql-simple ]; + description = "Using MySQL to store id-to-json tables"; + license = lib.licenses.mit; + mainProgram = "mysql-json-table-test"; + }) {}; + "mysql-pure" = callPackage ({ mkDerivation, attoparsec, base, binary, binary-ieee754 , blaze-textual, bytestring, bytestring-lexing, case-insensitive @@ -210076,20 +210807,16 @@ self: { }) {}; "neat-interpolation" = callPackage - ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text + ({ mkDerivation, base, megaparsec, rerebase, tasty, tasty-hunit + , template-haskell, text }: mkDerivation { pname = "neat-interpolation"; - version = "0.5.1.3"; - sha256 = "01v5ccv16gw13mjxdxcxnbs6ggzmqh4vwzybzkzqzm40la163aqz"; + version = "0.5.1.4"; + sha256 = "1drs0aghqxr960sciwjqsnpkhphlp3s4idpqrzh8f3frn7ik7dwf"; libraryHaskellDepends = [ base megaparsec template-haskell text ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A quasiquoter for neat and simple multiline text interpolation"; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "Quasiquoter for neat and simple multiline text interpolation"; license = lib.licenses.mit; }) {}; @@ -211458,15 +212185,12 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "network-byte-order"; - version = "0.1.6"; - sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; - revision = "1"; - editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; + version = "0.1.7"; + sha256 = "0yc6s2zdxkr2awmf56vqwds417ix8rgq33ffsk44wdk7gyny0328"; libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = lib.licenses.bsd3; }) {}; @@ -211780,6 +212504,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -212323,6 +213049,8 @@ self: { pname = "network-uri"; version = "2.6.4.2"; sha256 = "0a3jg6aykwm1yw32nh137hi6r86w2640xwl1p18352bf29rqj64w"; + revision = "1"; + editedCabalFile = "12350bi5sqamk1mdgkm757q3p2q96bvhm2yvl98mcawnfdrvbzvg"; libraryHaskellDepends = [ base deepseq parsec template-haskell th-compat ]; @@ -213052,8 +213780,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.0"; - sha256 = "0kn0h7c13zvsav93gn8bhmhx1nhdnp9vg2kgscw248f4l4czf2fp"; + version = "1.2.2"; + sha256 = "18jbvjziy3dakp59bhz4gx9b6w74g1y7mwcmlgmy5wc0snqx22j8"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -214268,8 +214996,10 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.4"; - sha256 = "0x88vi1llky86fdrzgvfilgl724jp3kfj8mn8zf9vwjbilap5qy1"; + version = "0.3.5"; + sha256 = "0xnxisshns862l5khb70i6pkzc9l95j33vkqlk046xl6galcxdvd"; + revision = "1"; + editedCabalFile = "15rjy9al76b001qd5nyzfpadxwhhsla02q50pm8d5p1a9y4z0vzp"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -214432,8 +215162,8 @@ self: { }: mkDerivation { pname = "nonempty-vector"; - version = "0.2.2.0"; - sha256 = "0nfvqp59jk8j0r4mj1v8q87hfznhkrscbgz2z7i7cva8fgqjrivg"; + version = "0.2.3"; + sha256 = "18xcsw2c9gy03dvrlanh799j1ab6dkpd6wwgj8b681r12ha04dqa"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck vector @@ -215720,6 +216450,8 @@ self: { pname = "numeric-prelude"; version = "0.4.4"; sha256 = "04x6ry2sxr5hsiz4098dn2gqyjqywiq2xk0anf6wc4xrvasgccjs"; + revision = "1"; + editedCabalFile = "0w5an2w06vpi75qj9972qbsiz4n72mr6mkib4ivlrrirndsyda79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216426,6 +217158,18 @@ self: { mainProgram = "play-o-clock"; }) {}; + "oalg-base" = callPackage + ({ mkDerivation, array, base, deepseq, random, time }: + mkDerivation { + pname = "oalg-base"; + version = "1.0.0.0"; + sha256 = "1x5k59wj08fr7h1ycwwalf669xia9573hhykl0x09zz50zfjzl41"; + libraryHaskellDepends = [ array base deepseq random time ]; + testHaskellDepends = [ array base deepseq random time ]; + description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems"; + license = lib.licenses.bsd3; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -218181,7 +218925,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_10_1_1" = callPackage + "opaleye_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -218191,8 +218935,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.1.1"; - sha256 = "0788dvmzpw51fwb3flpvmacky3qvh7kd0h8lv4nwjzqlj7l1n2dq"; + version = "0.10.2.0"; + sha256 = "0an98lspk77zxg4phvll5zjxviq3q4iwc75p9k7aqqa1hvm4wrdj"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -219145,8 +219889,8 @@ self: { pname = "openssl-streams"; version = "1.2.3.0"; sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; - revision = "1"; - editedCabalFile = "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp"; + revision = "2"; + editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -221496,8 +222240,8 @@ self: { }: mkDerivation { pname = "pa-field-parser"; - version = "0.2.0.1"; - sha256 = "1dkyi4gzsp2d0hfl8plmmirz6hlgy6ncd8nvxb34ax9nxi880c6v"; + version = "0.3.0.0"; + sha256 = "0myd5zcxz7cx731a9ymqnny34k2gjav7x7053f358r5dymmjp32j"; libraryHaskellDepends = [ aeson aeson-better-errors attoparsec base case-insensitive containers pa-error-tree pa-prelude scientific semigroupoids @@ -221509,18 +222253,18 @@ self: { "pa-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty, base - , base64-bytestring, bytestring, containers, hspec-core - , hspec-expectations, pa-error-tree, pa-label, pa-prelude - , scientific, text, time, vector + , base64-bytestring, bytestring, containers, pa-error-tree + , pa-field-parser, pa-label, pa-prelude, scientific, text, time + , vector }: mkDerivation { pname = "pa-json"; - version = "0.2.1.0"; - sha256 = "1j260q8mfd46fg4iijfva2b3db7k9zfyjpn1qblkhpf073x79hnh"; + version = "0.3.0.0"; + sha256 = "0fwjv244kbbc9zixf64654fwdykk8h4qc7iv7w7l08bywmjrgrs5"; libraryHaskellDepends = [ aeson aeson-better-errors aeson-pretty base base64-bytestring - bytestring containers hspec-core hspec-expectations pa-error-tree - pa-label pa-prelude scientific text time vector + bytestring containers pa-error-tree pa-field-parser pa-label + pa-prelude scientific text time vector ]; description = "Our JSON parsers/encoders"; license = lib.licenses.bsd3; @@ -221539,16 +222283,17 @@ self: { "pa-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, error, exceptions - , mtl, profunctors, PyF, semigroupoids, text, these - , validation-selective + , mtl, profunctors, PyF, scientific, semigroupoids + , template-haskell, text, these, validation-selective, vector }: mkDerivation { pname = "pa-prelude"; - version = "0.1.0.0"; - sha256 = "1as9kj351ph10nqzqxfnqyhnm7d10gc0jlnh3q9m8wdzmkimciam"; + version = "0.2.0.0"; + sha256 = "00gkyypa17ic2s019jmrxwjaylnfryn6nlg20ky1iip935y5y0b8"; libraryHaskellDepends = [ base bytestring containers error exceptions mtl profunctors PyF - semigroupoids text these validation-selective + scientific semigroupoids template-haskell text these + validation-selective vector ]; description = "The Possehl Analytics Prelude"; license = lib.licenses.bsd3; @@ -224447,14 +225192,12 @@ self: { }) {}; "park-bench" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, array, base, bytestring, ghc-prim, text }: mkDerivation { pname = "park-bench"; - version = "0.1.0.1"; - sha256 = "0ricvj3q4y8xdb47py9q6j23xw6fcy6l1000qm5naqkqkfz6rp35"; - revision = "2"; - editedCabalFile = "15lczl28f4cyldsx0rhg9kwi5xxykh8yw1la9s9gn28dx35809bz"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.0"; + sha256 = "15vbhljsnqjm3hjqxlzifvkbcysmwz3fqw2hmdlwkzsyncz4p6j9"; + libraryHaskellDepends = [ array base bytestring ghc-prim text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; }) {}; @@ -225301,6 +226044,18 @@ self: { license = "unknown"; }) {}; + "partialord" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "partialord"; + version = "0.0.2"; + sha256 = "1cnsjn3s154ar439gcphblm1pwvqn6w88c1hyvin7xapnssrg32g"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + description = "Data structure supporting partial orders"; + license = lib.licenses.bsd3; + }) {}; + "partly" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, bytestring, optparse-applicative, QuickCheck, vector @@ -225593,27 +226348,27 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-types, process, QuickCheck, skylighting, tasty + , pandoc-types, process, QuickCheck, random, skylighting, tasty , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, wcwidth, yaml + , unordered-containers, vector, wcwidth, yaml }: mkDerivation { pname = "patat"; - version = "0.9.2.0"; - sha256 = "0qhgb8lmmbxdjwim0z1dc6jyzlcg01p9y8cbz8dn8pdzbjbaj8m5"; + version = "0.10.1.1"; + sha256 = "0ndfqrnrl94rw4lnc3jmyijgpxj9xgl3m3f4iz8ilc4w36j96vpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc pandoc-types process - skylighting terminal-size text time unordered-containers wcwidth - yaml + network-uri optparse-applicative pandoc pandoc-types process random + skylighting terminal-size text time unordered-containers vector + wcwidth yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory pandoc QuickCheck tasty tasty-hunit tasty-quickcheck - text + ansi-terminal base directory pandoc QuickCheck tasty tasty-hunit + tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -225669,8 +226424,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "1"; - editedCabalFile = "0lkzfa4509id7xbnwmxb55p5dh5blz33dp3kv3c5j7yr6mdd10hs"; + revision = "2"; + editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225751,6 +226506,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "path_0_9_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-hspec, genvalidity-property + , hashable, hspec, mtl, QuickCheck, template-haskell, text + , validity + }: + mkDerivation { + pname = "path"; + version = "0.9.5"; + sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + text + ]; + testHaskellDepends = [ + aeson base bytestring filepath genvalidity genvalidity-hspec + genvalidity-property hspec mtl QuickCheck template-haskell validity + ]; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-binary-instance" = callPackage ({ mkDerivation, base, binary, path }: mkDerivation { @@ -226011,6 +226789,8 @@ self: { pname = "pathtype"; version = "0.8.1.2"; sha256 = "1ikbl1yzlimf5yjvi6agliraqdi6mf6m7ig5rx97wh03vrx58hfk"; + revision = "1"; + editedCabalFile = "0iy54kvjh9nf7n870pqggw82rmx8w5hz8hv96dq9swn7dvpq52wj"; libraryHaskellDepends = [ base deepseq directory doctest-exitcode-stdio QuickCheck semigroups tagged time transformers utility-ht @@ -227871,44 +228651,6 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.5.2"; - sha256 = "13j9aawkdiy5wqx8q4xbnskjr35g0pgx1l0iv3ir0z60xfl717gz"; - 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; - 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 = [ @@ -227932,7 +228674,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -228008,35 +228749,6 @@ self: { }: mkDerivation { pname = "persistent-discover"; - version = "0.1.0.6"; - sha256 = "1p4qvyjrf142192g9chxpdawpb55vk3dxrb1w0clwrhbz2w1q6q9"; - 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; - 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; @@ -228056,7 +228768,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Persistent module discover utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "persistent-discover"; }) {}; @@ -228531,27 +229242,6 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.5"; - sha256 = "1mkgrczllayf8mq773rqp11d677fqjxcblmb3l97m0k1qyvpjq1h"; - 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; - }) {}; - - "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 = [ @@ -228564,7 +229254,6 @@ self: { ]; description = "Provides a quasi-quoter for raw SQL for persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-ratelimit" = callPackage @@ -228671,38 +229360,6 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.1.1"; - sha256 = "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"; - 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; - 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" ]; @@ -228722,7 +229379,6 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; @@ -231186,8 +231842,8 @@ self: { }: mkDerivation { pname = "pipes-binary"; - version = "0.4.3"; - sha256 = "1r3byrp8z99rkz2z7pjrz88i4y8qy1qy38ih363ky65r87hbw6d3"; + version = "0.4.4"; + sha256 = "1grylcr2iiqa9wlki821lgabll4d53lmrzxw5nycpva546z8v13b"; libraryHaskellDepends = [ base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse transformers @@ -232212,6 +232868,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.2"; sha256 = "0s42dnack5yasbx958dshhlhq58qd41vw2plwr9c20d6lkd95wh5"; + revision = "1"; + editedCabalFile = "1xkan9nazclmnsvqqdzxz2y83hddhwbypkw0vvmcs3h3kai5mgga"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -233599,8 +234257,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.15"; sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; - revision = "2"; - editedCabalFile = "1m23ll2r9aizgp21jssyxxqa20lg93carpn7gwdfzafakwjzdg26"; + revision = "3"; + editedCabalFile = "0vw7i9p71bvvnawn2xdxvbyk17n92wlqndq8w2y3nlj3g7ivwmrd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233967,6 +234625,8 @@ self: { pname = "poly"; version = "0.5.1.0"; sha256 = "0ycjdan9l92glnqr0lms2kdjfs5dg9c2ky2w2rdmrc6nzzxajd9k"; + revision = "1"; + editedCabalFile = "1fhq09zg8fiz8k8ijv13vxdzy8rq8bn5nm370pbjz60kg40lymwc"; libraryHaskellDepends = [ base deepseq finite-typelits primitive semirings vector vector-algorithms vector-sized @@ -234209,8 +234869,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.2"; - sha256 = "0b1mlv4ny7kga8a9bk2gj9y39kjlf5vwbnp6zkx6i6wfjg1z1i4c"; + version = "1.9.1.3"; + sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -235435,6 +236095,8 @@ self: { pname = "pooled-io"; version = "0.0.2.3"; sha256 = "0ysgfwlppilj21sqhbcq7xbyc5hnc26mzb58y7mm9rd5piw3v7mc"; + revision = "1"; + editedCabalFile = "1c2ggwlgr22zwc15x175hl08ql3fls278nwzdb3igqggdv5kx6cz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236300,8 +236962,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.11.1.0"; - sha256 = "1q7pgklgc0d93hwacv3akx1vi29hvanj7lpyl29nzzwwk2y2pird"; + version = "0.11.2.1"; + sha256 = "0zlm0gk4sxm84kx205n5z0r0nw13kajk7400zbi9v2xslwjpgxnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236349,6 +237011,32 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_13_1_1" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, criterion, network-ip + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.13.1.1"; + sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -236551,6 +237239,8 @@ self: { pname = "postgresql-migration"; version = "0.2.1.7"; sha256 = "0r8pmy9905549vavbmps4627d2a5agz7hq0wv9663xdibvqsaf78"; + revision = "1"; + editedCabalFile = "1s5kcfnbsh5y1jsybvpl92j32wp43n8pd56981wynnrhh3kinlbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239010,8 +239700,8 @@ self: { pname = "prettyprinter-interp"; version = "0.2.0.0"; sha256 = "0ml068y49n0s6p0nq0qfv5dmpkpkbd9p06hkj582yn2a1h32x0ff"; - revision = "2"; - editedCabalFile = "0fyb4rgxgavh1fwdc54fh5vl9wqynsqgf72dq1a0v6gmqb2aaqys"; + revision = "3"; + editedCabalFile = "079c6ri9aahi4whnxzyh5d3nnawmjvn1kjkq6jdsnp96bflkkhv9"; libraryHaskellDepends = [ base prettyprinter string-interpolate template-haskell text ]; @@ -239289,14 +239979,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive_0_9_0_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, tagged, tasty, tasty-bench + , tasty-quickcheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.9.0.0"; + sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + benchmarkHaskellDepends = [ + base deepseq tasty-bench transformers + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-addr"; version = "0.1.0.2"; sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; - revision = "1"; - editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f"; + revision = "2"; + editedCabalFile = "1s18b6xm6906ldj8wd2b2j885xbgvf5mzabd4mpl1ic7a9205qgn"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = lib.licenses.bsd3; @@ -239373,23 +240088,46 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.7"; - sha256 = "0z3l1hcnqbzz14k3j4ylfh48v048l0y9waa6k447x8vqrkbrzm56"; + version = "0.10.1.8"; + sha256 = "1c91izq58s0v9z4p2kb91af179n4dagvwkqqp46fzvam6n2xcrw3"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector ]; testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + }) {}; + + "primitive-extras_0_10_1_10" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.10"; + sha256 = "1b83m53dwd2wagqzf0sy6wzsh3kj8prwdkkh6xbm6x0sqmr5ky8l"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "primitive-foreign" = callPackage @@ -239546,8 +240284,8 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.2"; sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; - revision = "1"; - editedCabalFile = "1kndcxl120bl0wzjjd8s2nxcw4qw5y3q6vzdqxn8p4xblk1vxajk"; + revision = "4"; + editedCabalFile = "0ya85xy2zs5fr3hb3hhhps34nrncj3ski7h2zc9d68i5zlhiacmf"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; @@ -240399,8 +241137,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "2"; - editedCabalFile = "0v595d8b2lv89nxyhgmzyp90i1h9vzlhbp6ry9gf99n7rdp525fw"; + revision = "3"; + editedCabalFile = "0a9i5gxa5ls17vj6blymfl63zndk887mylc4k7bzj014xl177hsg"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -243141,8 +243879,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.11"; - sha256 = "1zapnx6d7h4xas2mn6p2mq81gq7wr1zx9vd94xplmyghb1db1gcs"; + version = "0.15.12"; + sha256 = "0rsllqg7k7xkgda1j2vk6sfb9k18vp6d16xwkz4bhjsakrl28dqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244283,8 +245021,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.8"; - sha256 = "1f8ydz1s07p5817l746vxvsh8xprbkrffhmgv2wkqx61s05rc5ch"; + version = "0.9.9"; + sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -244899,8 +245637,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.6"; - sha256 = "0cxgwd3flwc2kyw4gj4ak6c12j89agka3z8mb8nllr5vi4ll4xi5"; + version = "0.1.7"; + sha256 = "09pdlp49ix56cnshscq1knmakwcgwjq1p24i2rf4yyfc8hkj3bfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245195,36 +245933,10 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.29.1"; - sha256 = "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"; - revision = "2"; - editedCabalFile = "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip"; - 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; - }) {}; - - "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"; + revision = "1"; + editedCabalFile = "0khr8jyxb0kxqmpi8sn7f0i89cwj4fq2chsygl4f02kflkji53dp"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -245238,7 +245950,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -246269,8 +246980,8 @@ self: { pname = "quotet"; version = "0.0.1.1"; sha256 = "16fwbf9q2ivpi3j7y26lsbqvwwk7vidjn6q9iz4x6sq8adhy45rz"; - revision = "2"; - editedCabalFile = "1czfh5jrrllpy9kgd2i2d5dx5rljz7k0ik9gdc3gw6qnlxkdnzni"; + revision = "3"; + editedCabalFile = "1k5lh7nk1yircafndxh4i4wl0jiblivlqrrqv5npc8r9d0sw3kf0"; libraryHaskellDepends = [ base mtl template-haskell th-compat ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; @@ -246353,8 +247064,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.7"; - sha256 = "1sx2p1xqash0737z0s5hg2848j9zf02941ksmwd7dlmfaz35x57h"; + version = "0.3.8"; + sha256 = "1l4lxha5c73855h19wpjk5l3vkkqz63rr4iicwilil92r4wrav51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -247479,8 +248190,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.2"; - sha256 = "1qhb6ijziq3g58qs3b22k1cg8601a4vd4vaka6cq0ny5x8x54b8v"; + version = "1.5.3"; + sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base data-functor-logistic distributive template-haskell @@ -249302,7 +250013,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_20" = callPackage + "rebase_1_20_1_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -249311,8 +250022,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.20"; - sha256 = "17r3h5gvr9q6dp8h0vvgm60rn2yjikbrzb8q20xxymhynxh7s74x"; + version = "1.20.1.1"; + sha256 = "1fwshqfshqxdjfxb9flbch40mjdjqfc3vl7q1j9b1dcv7jfyjv0h"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -249686,6 +250397,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "recursion-schemes_5_2_2_5" = callPackage + ({ mkDerivation, base, comonad, containers, data-fix, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.2.2.5"; + sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; + libraryHaskellDepends = [ + base comonad containers data-fix free template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -251799,8 +252528,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "5"; - editedCabalFile = "0lsciwi4akvk6s6h69ga359lj7cnn6p2i6dmqsy5nvar8m22i0cn"; + revision = "6"; + editedCabalFile = "1rn3649yqqrbd177mbyk12gdpbm3kdzjgnjqxfv68crah237y08j"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -253013,31 +253742,6 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.0.0"; - sha256 = "0wqj5ipsm3wwl401q5c5w6q6q07qd825y2d10j3q9gqsvyrpgqfb"; - revision = "1"; - editedCabalFile = "1vbmqnahjkvv6wla19vd8pl2k8i0di54c1q37ahx02i4zmnwv6zr"; - 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; - }) {}; - - "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 = [ @@ -253052,7 +253756,6 @@ self: { ]; description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "remark" = callPackage @@ -254193,12 +254896,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_20" = callPackage + "rerebase_1_20_1_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.20"; - sha256 = "1p4sbhsyz251w7m9iq4wvqh4xbwcc7pm6q97wrh6h77zrj1yq1zj"; + version = "1.20.1.1"; + sha256 = "1rwqk72y0ky8xc3r5j1f04f8a7g37l8j5ybcadxf0wsbnhnz0lli"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -256969,8 +257672,8 @@ self: { }: mkDerivation { pname = "rock"; - version = "0.3.1.1"; - sha256 = "0r6z9all4ynsam4z3ln0ad0zycfk6pxvwavfzr4icfwg5ifj01hi"; + version = "0.3.1.2"; + sha256 = "0zcqff2k3fnq1243lmznwvdrqy942i84q1xknwqqs9d060pyfsvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257525,6 +258228,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rose-trie" = callPackage @@ -258163,8 +258868,8 @@ self: { }: mkDerivation { pname = "rrb-vector"; - version = "0.2.0.0"; - sha256 = "17lmf79dzynpw43ibs7xzq31bvim5wj7a91k5h3bdzwjwwh1sy0x"; + version = "0.2.0.1"; + sha256 = "05wg7nz9p3ipn9az37yvaw48gmhchfc9hnqrfbsrbr9jghvm536v"; libraryHaskellDepends = [ base deepseq indexed-traversable primitive ]; @@ -258914,8 +259619,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.6.5"; - sha256 = "04xvh3yymqhn3kr4h5q8cysww5f5bw0zr6n0m8wrp428s211iw0a"; + version = "0.6.7"; + sha256 = "1k7ngvdsn59q7b7j9q1cfm1r6vwxqhbaal7qnxy0r9y6vcc6ggxf"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -259192,6 +259897,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.4"; sha256 = "1xhyljfvf1zpr7gpi9xgqmi9xsiv5vcjz52gz65zyq4v1kaxhl9w"; + revision = "1"; + editedCabalFile = "1laifqnsvli7x74asal5l4qhsvgvc6hycjqmrg7qmmabsldjddwb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec transformers void ]; description = "Safe, consistent, and easy exception handling"; @@ -259573,8 +260280,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "7"; - editedCabalFile = "1haylxnkj7if9q2kmhp5cvb7xi68fk00q0nqjvfc0giih9mjr1ck"; + revision = "8"; + editedCabalFile = "03w9x2p5cnwngwl698p12vm62gbbd5n3ckw6p9hm0j177jdhsynr"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -260546,6 +261253,18 @@ self: { mainProgram = "sat-micro"; }) {}; + "sat-simple" = callPackage + ({ mkDerivation, base, containers, minisat, unliftio-core }: + mkDerivation { + pname = "sat-simple"; + version = "0.1.0.0"; + sha256 = "0w80zfhlh4w506iajkan09vi71q7rbxfl65vsglnwhxsk2kdk3nw"; + libraryHaskellDepends = [ base containers minisat unliftio-core ]; + testHaskellDepends = [ base containers ]; + description = "A high-level wrapper over minisat"; + license = lib.licenses.bsd3; + }) {}; + "satchmo" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, hashable, lens, minisat, mtl, process @@ -260785,8 +261504,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.0.0"; - sha256 = "1fdwhpmksqzhlhsk0i4nq7ng20j6b9pbq01fwpbnb5jsyw9wa9m5"; + version = "1.2.2.0"; + sha256 = "0dmvdf8zs8sf4lwyjzryb2bszfzwgi0wbh232s41g35070sdhy5q"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; @@ -261819,8 +262538,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "6"; - editedCabalFile = "1clrcp8a20zg7iqrrg4agk5sblmz87fr4wq45v54n1inbf2ls508"; + revision = "7"; + editedCabalFile = "1wkf63yiklpxgagvsq13ddvhg128l4yk50ajz2giclxl36mmb5wh"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -262876,9 +263595,7 @@ self: { executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; description = "Haskell bindings to SDL2_gfx"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl2-gfx-example"; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -262972,8 +263689,6 @@ self: { description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -265055,8 +265770,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.1.0"; - sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; + version = "0.3.1.1"; + sha256 = "037if4mgccbbi2n52dfvkn63sbcymvsj3a6njz1wk4gjb7rgsgrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265067,9 +265782,7 @@ self: { ]; description = "Servant support for JuicyPixels"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "image-conversion"; - broken = true; }) {}; "servant-aeson-specs" = callPackage @@ -266644,6 +267357,8 @@ self: { pname = "servant-lucid"; version = "0.9.0.6"; sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; + revision = "1"; + editedCabalFile = "1b76mpiicbx9n062q7br0da6hbmwrbkkc881rh87l0snl03rzpmp"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -269772,7 +270487,6 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -273180,10 +273894,8 @@ self: { ({ mkDerivation, base, singletons, singletons-base }: mkDerivation { pname = "singleton-nats"; - version = "0.4.6"; - sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; - revision = "2"; - editedCabalFile = "044gxxa9j076p1g4vca4j8w5brx2qg5yqdvqjvmz6fv5kms4b8jd"; + version = "0.4.7"; + sha256 = "18n2p5cl75rl2afvq4qy3vilcvbyx8wz0qh4w4m9aqakk3lyv87i"; libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; @@ -273208,8 +273920,8 @@ self: { pname = "singletons"; version = "3.0.2"; sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; - revision = "1"; - editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy"; + revision = "2"; + editedCabalFile = "040hwa1r4vx64v62ffw2nfn29h91ns082zqc47jsp5ciwl69821p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -273238,15 +273950,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_2" = callPackage + "singletons-base_3_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.2"; - sha256 = "0m96dz9k5wls5m3vls65clws1yfd73skblv878yj06lw9nmwshy9"; + version = "3.3"; + sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -273295,14 +274007,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_2" = callPackage + "singletons-th_3_3" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.2"; - sha256 = "1r4m9h9wwq86lww3aq7jxzias78ix79kgnj24slaps848d7hhpkp"; + version = "3.3"; + sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -273590,6 +274302,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "size-based_0_1_3_2" = callPackage + ({ mkDerivation, base, dictionary-sharing, template-haskell + , testing-type-modifiers + }: + mkDerivation { + pname = "size-based"; + version = "0.1.3.2"; + sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + libraryHaskellDepends = [ + base dictionary-sharing template-haskell testing-type-modifiers + ]; + description = "Sized functors, for size-based enumerations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat @@ -273948,6 +274676,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -274482,6 +275212,23 @@ self: { license = lib.licenses.mit; }) {}; + "slave-thread_1_1_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, rerebase + , SafeSemaphore, stm-containers, tasty, tasty-hunit + }: + mkDerivation { + pname = "slave-thread"; + version = "1.1.0.3"; + sha256 = "02ydjlm87z75h44ci8iamidf63yjxrpal5bqaim6iy0ixdg13c5r"; + libraryHaskellDepends = [ + base deferred-folds focus foldl stm-containers + ]; + testHaskellDepends = [ rerebase SafeSemaphore tasty tasty-hunit ]; + description = "A fundamental solution to ghost threads and silent exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "sleep" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -274626,6 +275373,8 @@ self: { pname = "slist"; version = "0.2.1.0"; sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; + revision = "1"; + editedCabalFile = "0a3m4y2jy40xz7j4zgxj409nmhscz63yzikcqjgz1l9yl39i7437"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest Glob hedgehog hspec hspec-hedgehog @@ -275909,8 +276658,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "2"; - editedCabalFile = "0gpnjqvcgpbvv72m94q1qghs7dzrc10s0qdr71yar0zmv2j06pnj"; + revision = "3"; + editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -277940,6 +278689,8 @@ self: { pname = "some"; version = "1.0.5"; sha256 = "0pwivkyhdndh9f79gsz5gx51if8wm3r8mvbkysz2pq5m77g7kpmh"; + revision = "1"; + editedCabalFile = "060vrbwlc4xrwkh92q3jkgdy7zjzrzlg2k0ll0wklxaph9siphzr"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -277988,8 +278739,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; - revision = "2"; - editedCabalFile = "0db36xhswrsc30cw5c5s7h6g1ykcb3bkjjnixaqqshxln6cwfsig"; + revision = "3"; + editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -278067,6 +278818,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "sorted-list_0_2_2_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.2.0"; + sha256 = "0dqgk1fxmk9z97wc5lii5rhalbjhfq6i9db95scj7g91lrv0zrrr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Type-enforced sorted lists and related functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sortee" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { @@ -278171,6 +278936,24 @@ self: { broken = true; }) {}; + "sound-change" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, mtl, parser-combinators, syb, template-haskell + }: + mkDerivation { + pname = "sound-change"; + version = "0.1.0.0"; + sha256 = "1xg9drlf5kaqkx3fyyvz386cwpdk7ynyypkalr7fxax0q0cmcs08"; + libraryHaskellDepends = [ + base containers megaparsec mtl parser-combinators syb + template-haskell + ]; + testHaskellDepends = [ base containers hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Apply sound changes to words"; + license = lib.licenses.mit; + }) {}; + "sound-collage" = callPackage ({ mkDerivation, base, comfort-array, comfort-fftw, containers , filepath, numeric-prelude, optparse-applicative, pathtype @@ -279557,6 +280340,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "split_0_2_4" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "split"; + version = "0.2.4"; + sha256 = "1crixdmpjzahfiwkkm995rj5ymnm60rknqy252dv23pks00f77vl"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Combinator library for splitting lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "split-channel" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -279621,32 +280417,6 @@ self: { }: mkDerivation { pname = "splitmix"; - version = "0.1.0.4"; - sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "2"; - editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; - 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; - }) {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 ]; @@ -279661,7 +280431,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {testu01 = null;}; "splitmix-distributions" = callPackage @@ -280078,15 +280847,19 @@ self: { }) {}; "sqids" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, split, text - , transformers + ({ mkDerivation, base, bytestring, containers, hspec, mtl, split + , text, transformers }: mkDerivation { pname = "sqids"; - version = "0.1.4.0"; - sha256 = "0nw5g8azgh4mw8nvvrryy8ck37xyv92p36rvpa73ickn5a20bp06"; - libraryHaskellDepends = [ base containers mtl text transformers ]; - testHaskellDepends = [ base containers hspec mtl split text ]; + version = "0.2.0.0"; + sha256 = "0sabrvwhzf9xvj9gwnwxjvg4f2qv7qgaabvl7nhrv12zxfjvh5jm"; + libraryHaskellDepends = [ + base bytestring containers mtl text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec mtl split text transformers + ]; description = "A small library that lets you generate YouTube-looking IDs from numbers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -281924,28 +282697,28 @@ self: { "stackctl" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka , amazonka-cloudformation, amazonka-core, amazonka-ec2 - , amazonka-lambda, amazonka-sso, amazonka-sts, base, Blammo - , 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, text-metrics, time + , amazonka-lambda, amazonka-mtl, amazonka-sso, amazonka-sts, base + , Blammo, 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, text-metrics, time , transformers, typed-process, unliftio, unordered-containers, uuid , yaml }: mkDerivation { pname = "stackctl"; - version = "1.5.0.1"; - sha256 = "0ncl4706np8zl739di6f4nyy44cm7pklppkvmjlsxzw6s6hgidsf"; + version = "1.6.0.0"; + sha256 = "0pb7w53zyq8kkczg6q29nkic8i5w2ma2hsvn0x0g8iq4i016c23c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation - amazonka-core amazonka-ec2 amazonka-lambda amazonka-sso - 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 text-metrics time transformers typed-process - unliftio unordered-containers uuid yaml + amazonka-core amazonka-ec2 amazonka-lambda amazonka-mtl + amazonka-sso 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 text-metrics time transformers + typed-process unliftio unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -282040,12 +282813,12 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.0.1.0"; - sha256 = "13q0pf0vjh19w9sshxa45gbfmhv707sizx6mf5s35003654a0bxm"; + version = "0.1.0.1"; + sha256 = "1f4sk6j9dbnjrb3hjjj9gpbzs66mkmij208vqyvb4z284agfhzng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base64 blaze-html bytestring clay colourista containers + array base base64 blaze-html bytestring clay colourista cryptohash-sha1 dir-traverse directory extensions filepath ghc ghc-boot-th gitrev microaeson optparse-applicative pretty-simple process relude slist text tomland trial trial-optparse-applicative @@ -283222,14 +283995,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_1_0" = callPackage + "stm_2_5_2_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.1.0"; - sha256 = "11c84d5qqvw2kfx6arw0vaf9h7pxwnyw8xvaf7fxjmhg4p8x16ib"; - revision = "1"; - editedCabalFile = "0wq35b8f0w577byhv0k1954pcy5bbv22w34qln0nlz62x8sgw1kr"; + version = "2.5.2.1"; + sha256 = "16xis3rj5i0qlr1nc8ybmcrjhhqc2mh4l4lblmi04k2x00aycas1"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -283336,6 +284107,28 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "stm-containers_1_2_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable + , list-t, quickcheck-instances, rerebase, stm-hamt, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-containers"; + version = "1.2.0.3"; + sha256 = "1cchysjykxiq3s85xaafxkz8kg1czygjs17jlk6ic3ihv2ybr34j"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t stm-hamt transformers + ]; + testHaskellDepends = [ + deferred-folds focus foldl free list-t quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Containers for STM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "stm-delay" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -283387,8 +284180,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.11"; - sha256 = "0dw5vrsc9dwbxnydibwlwhrrg2db2d2frlddw24nfhvydba12p3j"; + version = "1.2.0.13"; + sha256 = "0nbnh7ibdlcp0bw1jzmkdcq8ysdqz3f9143pd3yj635mp0dyxgya"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -283404,6 +284197,32 @@ self: { license = lib.licenses.mit; }) {}; + "stm-hamt_1_2_0_14" = callPackage + ({ mkDerivation, async, base, criterion, deferred-folds, focus + , free, hashable, list-t, primitive, primitive-extras, QuickCheck + , quickcheck-instances, random, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.0.14"; + sha256 = "0rhqndyy3xq3xn408r17zshvjkibjc2562yzxx5qmjq8qsnlnjxd"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t primitive + primitive-extras transformers + ]; + testHaskellDepends = [ + deferred-folds focus QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async criterion focus free random rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stm-incremental" = callPackage ({ mkDerivation, base, hspec, stm }: mkDerivation { @@ -283814,10 +284633,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.13.1"; - sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; - revision = "3"; - editedCabalFile = "0iwdlamw4fm49qfawx7xp9alvv94l6q1xqrqav9k1q6486m27q99"; + version = "0.2.13.2"; + sha256 = "03nq5930yjpdvnyh93pjxzh3xjsracnnzcyqc0j3yiwadggbjy35"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck semigroups syb transformers unsafe utility-ht @@ -283863,8 +284680,8 @@ self: { "store" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec + , clock, containers, contravariant, criterion, cryptohash-sha1 + , deepseq, directory, filepath, free, ghc-prim, hashable, hspec , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base , monad-control, mono-traversable, nats, network, primitive , resourcet, safe, smallcheck, store-core, syb, template-haskell @@ -283874,20 +284691,20 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.16"; - sha256 = "125n9jcqjcyk7ypky4i0fydy1msgn8ldrhyhclqp1w0p7s2wazsg"; + version = "0.7.18"; + sha256 = "1qvfh7j1k8gfkllbvln5kfi45n59690yfkzdlazmajji8d8mp8z0"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable nats network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void + bytestring containers contravariant cryptohash-sha1 deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq + bytestring clock containers contravariant cryptohash-sha1 deepseq directory filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell @@ -283898,8 +284715,8 @@ self: { benchmarkHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control + cryptohash-sha1 deepseq directory filepath free ghc-prim hashable + hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell text th-lift th-lift-instances th-orphans th-reify-many th-utilities time transformers @@ -283915,10 +284732,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4.4.4"; - sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; - revision = "1"; - editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g"; + version = "0.4.4.6"; + sha256 = "1b4yhznw2xzi6qmbahf6p2sl9l8d1af36687gpwygd12h71qv17d"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -283928,13 +284743,13 @@ self: { "store-streaming" = callPackage ({ mkDerivation, async, base, bytestring, conduit, free, hspec - , hspec-smallcheck, network, resourcet, smallcheck, store - , store-core, streaming-commons, text, transformers, void + , hspec-discover, hspec-smallcheck, network, resourcet, smallcheck + , store, store-core, streaming-commons, text, transformers, void }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.3"; - sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q"; + version = "0.2.0.5"; + sha256 = "07xpsa3m7vjlv01gfay23v5ycy8fcddv551vbgs5bkg8vn7a5gvk"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -283944,6 +284759,7 @@ self: { resourcet smallcheck store store-core streaming-commons text transformers void ]; + testToolDepends = [ hspec-discover ]; description = "Streaming interfaces for `store`"; license = lib.licenses.mit; }) {}; @@ -284393,6 +285209,8 @@ self: { pname = "streaming-commons"; version = "0.2.2.6"; sha256 = "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"; + revision = "1"; + editedCabalFile = "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm"; libraryHaskellDepends = [ array async base bytestring directory network process random stm text transformers unix zlib @@ -284901,8 +285719,8 @@ self: { pname = "streamly-fsnotify"; version = "1.1.1.0"; sha256 = "1xcw4rsrysh96d91wjmyzb5s7cls3rf0ilpv8dn525iqzv11fl3l"; - revision = "3"; - editedCabalFile = "14jr2rx2iwyv2ibyyaahgw9xchn14r12ikkrxykc7nw0c4211x3i"; + revision = "4"; + editedCabalFile = "0b7yjszv2xapxqfghhdi7129dvsmgkzgzd361ancmfhmbkxvwlz4"; libraryHaskellDepends = [ base filepath fsnotify semirings streamly text time ]; @@ -285163,6 +285981,8 @@ self: { pname = "strict-base-types"; version = "0.8"; sha256 = "11cv7jbk37mmm3q6rjclw659qv9pav8f0aw8rbp3lj1sgfjyis9q"; + revision = "1"; + editedCabalFile = "1apyy4qi26d3j4chhd4csg1ymhvyajdvpq6hcs6mm9c2n20iw0yk"; libraryHaskellDepends = [ aeson base quickcheck-instances strict strict-lens ]; @@ -285390,6 +286210,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-tuple_0_1_5_3" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hashable }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.5.3"; + sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; + libraryHaskellDepends = [ base bifunctors deepseq hashable ]; + testHaskellDepends = [ base ]; + description = "Strict tuples"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-tuple-lens" = callPackage ({ mkDerivation, base, lens, strict-tuple }: mkDerivation { @@ -288378,8 +289211,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.6.0"; - sha256 = "0c3vmlya7cyc5bx6qfrbhmizrpsaww8bn3mrqnn7jyrldnixi77x"; + version = "0.10.7.0"; + sha256 = "0b783gir0zm248skrhjbnxn50wgyp9114lzn1ah5l047yr0cac63"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -288568,34 +289401,6 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base - , bytestring, containers, dlist, envparse, 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.0"; - sha256 = "0rviw43ks6rnl1m7wf8ffd70cnizz53svnsz2f9k69787xyqn6zb"; - libraryHaskellDepends = [ - async autodocodec autodocodec-yaml base bytestring containers dlist - envparse 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 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"; - }) {}; - - "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 @@ -288620,7 +289425,6 @@ self: { 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 @@ -288686,25 +289490,6 @@ self: { }: mkDerivation { pname = "sydtest-discover"; - version = "0.0.0.3"; - sha256 = "1q0lblsi9shad3kn4vlampfxjl4kq6h04lpf5a2xwwjjbhl40ns2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath optparse-applicative path path-io - ]; - executableHaskellDepends = [ base ]; - description = "Automatic test suite discovery for sydtest"; - license = "unknown"; - 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; @@ -288715,7 +289500,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatic test suite discovery for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "sydtest-discover"; }) {}; @@ -288761,8 +289545,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.4.0.0"; - sha256 = "0li8h3mh2s4ga8cpb0phaqyx6q1lw2w58b6yhs3s16a8cqh58k7x"; + version = "0.4.0.1"; + sha256 = "1bw33c71ra3m1wslmmclqkwnac9vbi871qigir5y4fr1p2arjgrn"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -288801,8 +289585,8 @@ self: { }: mkDerivation { pname = "sydtest-persistent"; - version = "0.0.0.1"; - sha256 = "19shysqqn4dz33lgmlshnk1aksp8f9rnxmzzag2hmbrywbrjwr1q"; + version = "0.0.0.2"; + sha256 = "09pjw6gd3vhny0irhpi93zy7snklrh2fjalsj8xszjb8j6md7d5p"; libraryHaskellDepends = [ base bytestring mtl persistent sydtest text unliftio ]; @@ -288817,15 +289601,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.2.0.2"; - sha256 = "1lrps2avkhshipip85gv8v151j3gkwxg6lfbii0085s077f8in1m"; + version = "0.2.0.3"; + sha256 = "1srzasbr9f5gqfzsa4qjd65pk3jlpk0gslphynzzbp4kf6gmsvkj"; libraryHaskellDepends = [ - base monad-logger mtl persistent persistent-postgresql sydtest + base monad-logger mtl persistent-postgresql sydtest sydtest-persistent tmp-postgres ]; - testHaskellDepends = [ - base persistent persistent-postgresql sydtest - ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "An persistent-postgresql companion library for sydtest"; license = "unknown"; @@ -288839,13 +289621,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.2.0.2"; - sha256 = "17sb4q2lrdbi4d5h7gj5lwxszla5dbzs25ira2ddlgghs68bar3g"; + version = "0.2.0.3"; + sha256 = "1wc4sgfjljwvcb90d3a4ys5m88fd68mbzyl6f2jfjx55yn55rnyw"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-sqlite sydtest sydtest-persistent ]; - testHaskellDepends = [ base persistent persistent-sqlite sydtest ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; @@ -288925,20 +289707,18 @@ self: { "sydtest-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-client - , http-types, mtl, network, pretty-show, stm, sydtest - , sydtest-discover, text, time, wai, warp + , http-types, mtl, network, sydtest, sydtest-discover, text, time + , wai, warp }: mkDerivation { pname = "sydtest-wai"; - version = "0.2.0.0"; - sha256 = "1zyhgwi8vhjg7mahp98fjgvkhqvh6zwfw3pmhwk57raavzsg2ksb"; + version = "0.2.0.1"; + sha256 = "0fmgn8g9ka275qkanzrlqr4wqwjcq2a99yvkh4jz53vspyiml78q"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-types mtl network - pretty-show sydtest text time wai warp - ]; - testHaskellDepends = [ - base http-client http-types stm sydtest wai + sydtest text time wai warp ]; + testHaskellDepends = [ base http-client http-types sydtest wai ]; testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; @@ -288976,8 +289756,8 @@ self: { }: mkDerivation { pname = "sydtest-webdriver-screenshot"; - version = "0.0.0.1"; - sha256 = "0wh481za6x9bq4axazq6zpm0cgi98hsh4xiy02c90fxybzdk4mg9"; + version = "0.0.0.2"; + sha256 = "18qg09cagga87bs2yahb2cv78agg90548w8a6p27nxhyq9jzamd7"; libraryHaskellDepends = [ base bytestring JuicyPixels mtl path path-io sydtest sydtest-webdriver webdriver @@ -289026,8 +289806,8 @@ self: { }: mkDerivation { pname = "sydtest-yesod"; - version = "0.3.0.1"; - sha256 = "1sfq18n25qczhp24hz95spg4ppigajysg0if5ah0k96k1q3p3f51"; + version = "0.3.0.2"; + sha256 = "194qdvsfphc8paq9ap5fijphrin20zpr4g5nza8dpv7qkpb82znr"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers cookie exceptions http-client http-client-tls http-types mtl network @@ -289035,8 +289815,8 @@ self: { yesod-test ]; testHaskellDepends = [ - base bytestring conduit cookie http-client http-types monad-logger - mtl path path-io persistent persistent-sqlite QuickCheck sydtest + base bytestring conduit cookie http-client monad-logger mtl path + path-io persistent persistent-sqlite QuickCheck sydtest sydtest-persistent-sqlite sydtest-wai text yesod yesod-core ]; testToolDepends = [ sydtest-discover ]; @@ -289962,8 +290742,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "3"; - editedCabalFile = "0fgrj8a1cgnhcbdyhj478plaj68mrakk945cbpc9brxzcs835x0y"; + revision = "4"; + editedCabalFile = "0xacplyxilmrly1nxdiz42divjiky7lz5aq5lizn7ax2n0jy1sdg"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -290054,8 +290834,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "1.1"; - sha256 = "118z30dj8w9fbfv5q6i9yfm1d0zhmykavpdcn3sb60z8fpmx7vl1"; + version = "1.1.0.1"; + sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290086,6 +290866,8 @@ self: { pname = "synthesizer-midi"; version = "0.6.1.2"; sha256 = "1xnpvk0mny8lbx17zdgl55wp86pqhfg9ckv41b3qd5vrki2dj6nc"; + revision = "1"; + editedCabalFile = "061dgdfrv1zrjpih29x50kpl57ghb3ys6wpra5ai9k0wxdpr9zqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -291440,6 +292222,8 @@ self: { pname = "tahoe-directory"; version = "0.1.0.0"; sha256 = "1659q860y776bx39nw3x7afqdazs5b31b5p9asc3g7al697xl6li"; + revision = "1"; + editedCabalFile = "0f7djrfakakc8390qsy9n2c5lwwppjivvia5f0p96nw2279mkyd9"; libraryHaskellDepends = [ base bytestring megaparsec tahoe-capabilities tahoe-chk tahoe-ssk text @@ -291454,44 +292238,51 @@ self: { }) {}; "tahoe-great-black-swamp" = callPackage - ({ mkDerivation, aeson, async, base, base32, base32string - , base64-bytestring, binary, bytestring, cborg, cborg-json - , connection, containers, deriving-aeson, directory, filepath - , foldl, hspec, hspec-expectations, hspec-wai, http-api-data - , http-client, http-client-tls, http-media, http-types, megaparsec - , network-uri, optparse-applicative, primitive, QuickCheck - , quickcheck-instances, safe-exceptions, scientific, serialise - , servant, servant-client, servant-docs, servant-js, servant-server - , tahoe-chk, temporary, text, unordered-containers, utf8-string - , vector, wai, wai-extra, warp, warp-tls + ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base + , base32, base32string, base64, base64-bytestring, binary + , bytestring, cborg, cborg-json, connection, containers, cryptonite + , data-default-class, deriving-aeson, directory, filepath, foldl + , hspec, hspec-expectations, hspec-wai, http-api-data, http-client + , http-client-tls, http-media, http-types, http2, lens, megaparsec + , memory, network, network-simple-tls, network-uri + , optparse-applicative, primitive, QuickCheck, quickcheck-instances + , safe-exceptions, scientific, serialise, servant, servant-client + , servant-docs, servant-js, servant-server, tahoe-chk, temporary + , text, tls, unordered-containers, utf8-string, vector, wai + , wai-extra, warp, warp-tls, x509, x509-store, x509-validation + , yaml }: mkDerivation { pname = "tahoe-great-black-swamp"; - version = "0.3.0.1"; - sha256 = "16n8jv5pb0z8x3dczpcqq29lmn24irinh81p9m75qad88i8p3r57"; + version = "0.3.1.0"; + sha256 = "1317sa6jq4vb5nxd4n6i9h799p3i0ghxl866sfkrppay9pncblzq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base64-bytestring binary bytestring cborg - cborg-json containers deriving-aeson directory filepath foldl - http-api-data http-media http-types primitive safe-exceptions + aeson asn1-encoding asn1-types async base base64 base64-bytestring + binary bytestring cborg cborg-json connection containers cryptonite + data-default-class deriving-aeson directory filepath foldl + http-api-data http-client http-client-tls http-media http-types + http2 memory network network-uri primitive safe-exceptions scientific serialise servant-client servant-docs servant-server - text unordered-containers utf8-string vector wai warp warp-tls + text tls unordered-containers utf8-string vector wai warp warp-tls + x509 x509-store x509-validation ]; executableHaskellDepends = [ - aeson async base base32 base64-bytestring binary bytestring cborg - connection containers deriving-aeson directory filepath foldl - http-client http-client-tls http-types megaparsec network-uri - optparse-applicative primitive safe-exceptions serialise servant - servant-client servant-js tahoe-chk text unordered-containers - vector warp + aeson async base base32 binary bytestring cborg connection + containers deriving-aeson directory filepath foldl http-client + http-client-tls http-types lens megaparsec optparse-applicative + primitive safe-exceptions serialise servant servant-client + servant-js tahoe-chk text unordered-containers vector warp ]; testHaskellDepends = [ - aeson async base base32string binary bytestring cborg containers - deriving-aeson directory filepath foldl hspec hspec-expectations - hspec-wai http-types primitive QuickCheck quickcheck-instances - safe-exceptions serialise servant temporary text - unordered-containers vector wai-extra + aeson async base base32string base64 binary bytestring cborg + connection containers data-default-class deriving-aeson directory + filepath foldl hspec hspec-expectations hspec-wai http-client + http-types network network-simple-tls primitive QuickCheck + quickcheck-instances safe-exceptions serialise servant + servant-client temporary text tls unordered-containers vector + wai-extra warp warp-tls x509 x509-store yaml ]; description = "An implementation of the \"Great Black Swamp\" LAFS protocol"; license = lib.licenses.bsd3; @@ -291506,8 +292297,8 @@ self: { }: mkDerivation { pname = "tahoe-ssk"; - version = "0.2.1.0"; - sha256 = "1qkzkdqqyjh2qzkl03f3wg4xlpmb8n1hq95bmdqwx1212aap3qxx"; + version = "0.3.0.0"; + sha256 = "0ham4qgdva5md76mv4gy5gfaw55h9a509967r7cxbaxlz1f1gdj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292183,7 +292974,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; + broken = true; }) {}; "taskpool" = callPackage @@ -292604,8 +293397,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "1"; - editedCabalFile = "1mwg576azkwzv13rk72cnbag4823hwpr8zgcfcrvx8wx5ha2r55p"; + revision = "2"; + editedCabalFile = "0im9603m995svkb3bvdrr7w1k2xz34hlw3dyam1123264ff1ka7x"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -292698,8 +293491,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; - revision = "1"; - editedCabalFile = "1wlaxalc750k1g5iqvkrwi2mfcblr9pk0jfc2qbkhhldajcl2wir"; + revision = "2"; + editedCabalFile = "17q4xwj2glc8d482r33kq472yhkx7nai987x80nw3ilmp942bxzd"; libraryHaskellDepends = [ base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -293064,8 +293857,8 @@ self: { pname = "tasty-rerun"; version = "1.1.19"; sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; - revision = "1"; - editedCabalFile = "1qi6rwnyrddk58b5mh9a2zh3af39kdl71f65ajlvbsh6y1n7fbkr"; + revision = "2"; + editedCabalFile = "01gliss91bx2xfpz4f99g82sqahir5g2rnwn531ccn8jp1m917di"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -293084,6 +293877,31 @@ self: { pname = "tasty-silver"; version = "3.3.1.2"; sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; + revision = "1"; + editedCabalFile = "1dzw6hvfxrbnfjb9b5ca6adbg3qbdh1rsbji4b3jm0hhgi40gkxr"; + 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_3" = 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.3"; + sha256 = "1gg4jkcgc3xiw43bw09shylxgd1rkrynyap17zh0yfzd9jrk3i4v"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -293095,6 +293913,7 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -293229,8 +294048,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.4"; - sha256 = "08a9zzzwq87p0bnb0x18xgqag2lfni9x6x74i8yrbb0b5pj22ixy"; + version = "0.1.0.5"; + sha256 = "12v1avr74zsaq2dnssbip7pc6qalh8w7ilqb5z8azplg6h83vh93"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -293261,8 +294080,8 @@ self: { pname = "tasty-wai"; version = "0.1.2.0"; sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg"; - revision = "1"; - editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c"; + revision = "2"; + editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -294142,12 +294961,12 @@ self: { broken = true; }) {}; - "template-haskell_2_20_0_0" = callPackage + "template-haskell_2_21_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.20.0.0"; - sha256 = "05r8176xx3bivb473zdvsgndss8lna1g9xy55agkh4cir84mvgp4"; + version = "2.21.0.0"; + sha256 = "0p8f53dscddr513r8p3ljwyc1pa7n520prxb47bz8dj5mvjxm89d"; libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; @@ -294165,6 +294984,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9.3"; + sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Backward-compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -294919,6 +295750,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox_1_1_0_2" = callPackage + ({ mkDerivation, base, termbox-bindings-hs }: + mkDerivation { + pname = "termbox"; + version = "1.1.0.2"; + sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; + libraryHaskellDepends = [ base termbox-bindings-hs ]; + description = "termbox"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-banana" = callPackage ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { @@ -294956,8 +295799,8 @@ self: { pname = "termbox-bindings-c"; version = "0.1.0"; sha256 = "1q7frripz88zgcfmx2lab2vrj19gywnskng07zf7icsj9j6bdwyw"; - revision = "1"; - editedCabalFile = "08qnbv5p0lys69qv0dcq896p47kvj770y4hvpqa7ywfm124fwcs3"; + revision = "2"; + editedCabalFile = "04hnf96p6n9fxczk2hbp53kl3gm06f8zx469nvzl48qjvcxhxc2i"; libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294969,8 +295812,8 @@ self: { pname = "termbox-bindings-hs"; version = "0.1.0"; sha256 = "07m6lp997skqp04a430ynsrzdpwcczblxawvlcbizffsznkmnl64"; - revision = "1"; - editedCabalFile = "19n2flldk0v6db6fipc4j2an0kyk3rw4229fmqd94kswy898cv6d"; + revision = "2"; + editedCabalFile = "0bpz5drzp1gfncbpsc9jjz6qyvjjn4c9w16ci79nj60zi7b5q9b5"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294991,6 +295834,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-tea_0_1_0_1" = callPackage + ({ mkDerivation, base, ki, termbox }: + mkDerivation { + pname = "termbox-tea"; + version = "0.1.0.1"; + sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki termbox ]; + description = "termbox + The Elm Architecture"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termcolor" = callPackage ({ mkDerivation, base, cli }: mkDerivation { @@ -296195,12 +297052,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-ansi_0_3_0" = callPackage + "text-ansi_0_3_0_1" = callPackage ({ mkDerivation, base, text, text-builder-linear }: mkDerivation { pname = "text-ansi"; - version = "0.3.0"; - sha256 = "0l2539rjhpmiw2is2wcqydql4j5wqmqccg8qdq172fc09fp87crm"; + version = "0.3.0.1"; + sha256 = "0iiq5zlcjh25mf9b4vlhyc1dwglwh8b03qj1wasbngzvmphvcy00"; libraryHaskellDepends = [ base text text-builder-linear ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -296256,6 +297113,24 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_7_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder-dev + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.7.1"; + sha256 = "1x2k1mwwwjbyc56c9dm454k24imwq17dym5pfbj33iqn9i4n7ki3"; + libraryHaskellDepends = [ base bytestring text text-builder-dev ]; + testHaskellDepends = [ + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-dev" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , isomorphism-class, QuickCheck, quickcheck-instances, rerebase @@ -296278,6 +297153,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_4_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes + , quickcheck-instances, rerebase, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.4.1"; + sha256 = "095kqq7wwnabfyj6380xy94a0v0d76mkwspdw8lj2m4ykq23agw1"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class QuickCheck + quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat quickcheck-classes quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench , tasty-quickcheck, text @@ -296471,8 +297370,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.8.0.3"; - sha256 = "0mv8pxrc65yrrh2mxksxribd7ihnn0rx2il5kxfxm5zn4fa2nvqc"; + version = "0.8.0.4"; + sha256 = "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; libraryPkgconfigDepends = [ icu ]; @@ -296540,6 +297439,8 @@ self: { pname = "text-iso8601"; version = "0.1"; sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; + revision = "1"; + editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; libraryHaskellDepends = [ base integer-conversion text time time-compat ]; @@ -296966,32 +297867,32 @@ self: { "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.9.6"; - sha256 = "1xmifjcx52jpa3qlmd5v11x429kn5qm64k2a7ai1lwpmy3mvpa90"; - revision = "1"; - editedCabalFile = "1bxyiy1x83mc3zmim27plcp4x9i6sg1xgl33q1zgfdd8n1m8jpv5"; + version = "3.9.7"; + sha256 = "1rxsg0i304wanzgd792nj7pgkmw3iq0n7pwsg27h55vi7kp2rmiw"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers unix unordered-containers - uuid-types vector xhtml + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml ]; testHaskellDepends = [ aeson base base-compat bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -297555,24 +298456,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_15" = callPackage + "th-desugar_1_16" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction , th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.15"; - sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; - revision = "1"; - editedCabalFile = "1mpig192p595d3961w1x35w50h8i6c9zp0h4d44mnjy2wd7hb99j"; + version = "1.16"; + sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat ]; testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-abstraction - th-orphans + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -298002,8 +298901,8 @@ self: { pname = "th-test-utils"; version = "1.2.1"; sha256 = "1vk5fj66w7smq4yc614ixh7s78n3djggpzcxmakyxfz01vz20gay"; - revision = "2"; - editedCabalFile = "0sjxy0v6g567n0vs8myi3vx0hbhhmd8k3jgjwsmp7zrvhzbfyw91"; + revision = "3"; + editedCabalFile = "1lacygmbb36ka1bd4kmi6mfjicpdzagf73433kjvqrk1316bayc0"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -298153,6 +299052,24 @@ self: { license = lib.licenses.mit; }) {}; + "theatre-dev" = callPackage + ({ mkDerivation, async, base, contravariant, hspec, rerebase, stm + , unagi-chan, vector + }: + mkDerivation { + pname = "theatre-dev"; + version = "0.0.1"; + sha256 = "0mvgbp5ba23gcjykki8x7wsdmdzqknm82rshf10rk9rc120jg5f6"; + libraryHaskellDepends = [ + async base contravariant stm unagi-chan vector + ]; + testHaskellDepends = [ hspec rerebase ]; + description = "Minimalistic actor library experiments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, mtl, relude, tasty, tasty-hunit, text, time @@ -298282,6 +299199,8 @@ self: { pname = "these-lens"; version = "1.0.1.3"; sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; + revision = "1"; + editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; @@ -298918,6 +299837,8 @@ self: { pname = "thyme"; version = "0.4"; sha256 = "098kqmirzcllfpfsxivc42dsvvlih89xfzkmif8gjzcqiw6agx41"; + revision = "1"; + editedCabalFile = "0y7xc8q2n8lbfi0q4isj29w5qdy3bjlb8yywdyajjp9k1kp23vnr"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers deepseq hashable mtl old-locale profunctors QuickCheck random template-haskell text time @@ -299092,6 +300013,8 @@ self: { pname = "tidal"; version = "1.9.4"; sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; + revision = "2"; + editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -300029,6 +300952,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "timer-wheel_1_0_0" = callPackage + ({ mkDerivation, atomic-primops, base, ki, primitive, random + , tasty-bench + }: + mkDerivation { + pname = "timer-wheel"; + version = "1.0.0"; + sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; + libraryHaskellDepends = [ atomic-primops base ki primitive ]; + testHaskellDepends = [ base ki random ]; + benchmarkHaskellDepends = [ base ki random tasty-bench ]; + description = "A timer wheel"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -302608,8 +303547,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.7.1"; - sha256 = "0l48j4f4skzgag07qjcgsckv2xiygf8pghqjn72ah7c0yr9ghx4z"; + version = "2.7.2"; + sha256 = "046pyd7mwhw5csisqvr38z6ipz2fyvajqfxbjl96anwi9g2pxlr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303740,8 +304679,8 @@ self: { pname = "tree-diff"; version = "0.3.0.1"; sha256 = "1bkjsklsqxq8i8p3zx73pck4ca1kv21zjvn9xhbhz191gygprrj0"; - revision = "3"; - editedCabalFile = "1skq2bqfsj1f4hqy5cwm8k0a8bgqbdqspcxccismbgxxqqg60d22"; + revision = "4"; + editedCabalFile = "1m13fy6igixsjg02nx2hhlxmhy2isvx28b1wzmllsdd99lmdasy5"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -304325,6 +305264,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "trifecta" = callPackage @@ -304912,6 +305853,8 @@ self: { pname = "ttc"; version = "1.3.0.0"; sha256 = "16px3ws0bzkzpf1hy7il40p7shv8w093fjim0rc1c45y40jp7p09"; + revision = "1"; + editedCabalFile = "1mqxayy3nh39lnmsdr7hsz6xlan95m05s49l0349s4724syflscz"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -305278,8 +306221,8 @@ self: { pname = "tuples"; version = "0.1.0.0"; sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; - revision = "1"; - editedCabalFile = "06ns2npjh487pbzq6f5iwqvl0n9a6d5fywlm032nj3mxdmaynj2j"; + revision = "2"; + editedCabalFile = "08d8f4svxfn6165438dvd4zh61wldrl7gsly8ip6x5svyvj3ygqb"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck @@ -305426,6 +306369,33 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "turtle_1_6_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, directory, doctest, exceptions, filepath, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, tasty, tasty-bench, tasty-hunit + , temporary, text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.6.2"; + sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions filepath foldl hostname managed optional-args + optparse-applicative process stm streaming-commons temporary text + time transformers unix unix-compat + ]; + testHaskellDepends = [ + base doctest filepath tasty tasty-hunit temporary + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Shell programming, Haskell-style"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -306397,8 +307367,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "5"; - editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m"; + revision = "6"; + editedCabalFile = "1992xb0qnn7jzc42q9dmkkqw0ddnz0cjl4anmga4dfc172pkxxgb"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -307150,8 +308120,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.5.2.2"; - sha256 = "17h6ig2phgdr5gq7pdswn50yjdqz7ci1nh4grwpz8m0qykkqj4v4"; + version = "0.5.2.3"; + sha256 = "0043a2nw5413ipixxf77k1c58h9ndrjh79v8cq46jw900qk4268z"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -307187,12 +308157,13 @@ self: { "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core + , hspec-discover, process, stm, temporary, transformers + , unliftio-core }: mkDerivation { pname = "typed-process"; - version = "0.2.11.0"; - sha256 = "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"; + version = "0.2.11.1"; + sha256 = "0j21v5ijnxkpwn9hng6achjypr1hnpfxkmjfvqssq6ynj6hdvifm"; libraryHaskellDepends = [ async base bytestring process stm transformers unliftio-core ]; @@ -307200,6 +308171,7 @@ self: { async base base64-bytestring bytestring hspec process stm temporary transformers unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; }) {}; @@ -307210,15 +308182,15 @@ self: { }: mkDerivation { pname = "typed-process-effectful"; - version = "1.0.0.0"; - sha256 = "08rp0nycr0yp9zplxjdgslg4z8imvdprv10zwn4085n02y7z2bd9"; + version = "1.0.0.1"; + sha256 = "1n3ba3jf48hc3w5y20k987aahz9pdzrqm54w0572x30ng3j8jic4"; libraryHaskellDepends = [ base bytestring effectful effectful-core typed-process ]; testHaskellDepends = [ base effectful effectful-core tasty tasty-hunit ]; - description = "A binding of the @typed-process@ library for the @effectful@ effect system"; + description = "A binding of the typed-process library for the effectful effect system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -307828,8 +308800,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "4"; - editedCabalFile = "1yfriqm5xfmynx6vszs72h2kic69zx1xp5fl51dys28s0yna9alf"; + revision = "5"; + editedCabalFile = "0r1wbf0c0fpns8vyr2xrrkkclzjcy212zb9ldsrcxx7jyz5nr0jj"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -308430,6 +309402,26 @@ self: { mainProgram = "ulid-exe"; }) {}; + "ulid-tight" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, hspec + , hspec-discover, primitive, random, template-haskell, text, time + }: + mkDerivation { + pname = "ulid-tight"; + version = "0.1"; + sha256 = "0gbf3xlzms9f3y1bbxmlgaccr1qwh3vypxzx4y0bd5z22d4l7g8h"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable primitive random + template-haskell text time + ]; + testHaskellDepends = [ + base binary hashable hspec primitive random text + ]; + testToolDepends = [ hspec-discover ]; + description = "Another ULID implementation with tight memory representation"; + license = lib.licenses.mit; + }) {}; + "una" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , io-storage, process @@ -310231,6 +311223,8 @@ self: { pname = "universe-base"; version = "1.1.3.1"; sha256 = "0bbkwmvpnfwvgwxvj0j591l984icrpq2js974nm8ribrblqfzrx3"; + revision = "1"; + editedCabalFile = "12mjh2hsqghayxybpvzka7chxds2h342w584n8g7hmld3y7qmjg4"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -310243,8 +311237,8 @@ self: { pname = "universe-dependent-sum"; version = "1.3"; sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5"; - revision = "3"; - editedCabalFile = "0v4n1z9zrsxfbr4nc44qq446wzkg5wk490np7vaq8780ygdz50gy"; + revision = "4"; + editedCabalFile = "0jd55qf6is8gi06r1q0a5vg0vgvr994vc7ybd0kfcsp2ybpk8zvg"; libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; @@ -310274,8 +311268,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.3"; sha256 = "02fxra5g76dk2jpbvmj0mj5bylj4400fcp3np3s5d31qgsjh2sn6"; - revision = "2"; - editedCabalFile = "175fxp19cf6m6scy6nxh5kbc6cnv9sqa0i00ly6swjsy5vy986am"; + revision = "3"; + editedCabalFile = "02zv257ga1n4qzb2r97fpzblm28db04ws3d02fy1nlry9hcwk554"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -310304,8 +311298,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1.1"; sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4"; - revision = "3"; - editedCabalFile = "1skyr1b7jvlbphlnf373qx78qd41cz643cn7ssyncwbv30ndbs23"; + revision = "4"; + editedCabalFile = "0s6779rs0p0wrarn749rasifiij8x8mihbg8m6cgazs1cxpfykjd"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = lib.licenses.bsd3; @@ -310319,8 +311313,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "5"; - editedCabalFile = "0d0xsfjhb9vaama4l4qq41l02y2lv0ri917rzmxskp6zw0dvwa57"; + revision = "6"; + editedCabalFile = "04vj4sp5kk90ncln7mmm52pbwbvx8zpkxfvzzxk1jbf20bc7x83n"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -310381,14 +311375,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_2_1" = callPackage + "unix_2_8_3_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.2.1"; - sha256 = "0hzffcmz5ga9lcpfw5gh6h5902bpwrh3kjjhm3jha08085a1apmx"; + version = "2.8.3.0"; + sha256 = "1asxibqs77gmgvqxigsf1mch3m4qgznfm1fpqhw0xh9fsil7ip59"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit tasty-quickcheck @@ -310620,27 +311614,48 @@ self: { mainProgram = "unlambda"; }) {}; + "unleash-client-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, http-client-tls + , http-media, mtl, servant, servant-client, text, time + , unleash-client-haskell-core, unliftio + }: + mkDerivation { + pname = "unleash-client-haskell"; + version = "0.6.0"; + sha256 = "1vl31yvcqrsq1j56hqi34qf280ibhv9rk9sfddkiw43qi58gs0v4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers http-client-tls http-media mtl servant + servant-client text time unleash-client-haskell-core + ]; + executableHaskellDepends = [ + base mtl servant-client text unleash-client-haskell-core unliftio + ]; + description = "Unleash feature toggle client"; + license = lib.licenses.mit; + mainProgram = "example"; + maintainers = [ lib.maintainers.evenbrenden ]; + }) {}; + "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 + , containers, hspec, murmur3, random, text, text-show, time + , versions }: mkDerivation { pname = "unleash-client-haskell-core"; - version = "0.8.9"; - sha256 = "0jq1dyzr882jfdykys6kkr2gkxv5gp7xyqdm1p69zlzsi6rrzq40"; + version = "0.10.0"; + sha256 = "0biki24hxvnvzd3zrvlb5f30nwlzzshm0sbajd2q55wpx98008fc"; libraryHaskellDepends = [ - aeson base containers murmur3 random record-dot-preprocessor - record-hasfield text text-show time versions + aeson base containers murmur3 random text text-show time versions ]; testHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring hspec - record-dot-preprocessor record-hasfield text + aeson aeson-pretty attoparsec base bytestring hspec text ]; description = "Unleash feature toggle client core"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.evenbrenden ]; }) {}; "unlift" = callPackage @@ -310867,8 +311882,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; - revision = "2"; - editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s"; + revision = "3"; + editedCabalFile = "1p9a2mvfbfz2d4cyr16b03bxvb6c4yj7k1ch601xwq1rkr1cla0w"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -311611,8 +312626,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; - revision = "2"; - editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"; + revision = "3"; + editedCabalFile = "007c8lv0x2p75f7m57c2hvp82i1c7jblwszbxaghba1xwi7jwhqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312770,29 +313785,6 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder - , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.5"; - sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; - revision = "4"; - editedCabalFile = "08anv4hc75n1npjl4b8hrww97imgh6bsm1mfqn33n29ga84jcrp4"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random template-haskell - text - ]; - testHaskellDepends = [ - base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit - tasty-quickcheck template-haskell - ]; - description = "Type definitions for Universally Unique Identifiers"; - 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 @@ -312811,7 +313803,6 @@ self: { ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uulib" = callPackage @@ -313292,8 +314283,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.12.0.1"; - sha256 = "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w"; + version = "0.12.0.2"; + sha256 = "1a916c8pwxc89p4zib07hnfiwqvv16k9v1lqggpvc6xbglcqidi9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -313726,8 +314717,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "3"; - editedCabalFile = "0avlxhj4m8sb1b9rh203jsaapw6q55bpgy4jnhjyq6an8dhnsg9i"; + revision = "4"; + editedCabalFile = "0nmy4c95kss381n38by7li9x1ffgxz1bvyw0dh52xklbi7v144bh"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -314113,10 +315104,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.13.0.0"; - sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "5"; - editedCabalFile = "0j239l4jjjyxaly65fpyg8458k8srgnsy5kn8710c7hmqwl222qx"; + version = "0.13.1.0"; + sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -314136,8 +315125,8 @@ self: { pname = "vector-algorithms"; version = "0.9.0.1"; sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "2"; - editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk"; + revision = "3"; + editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -314559,8 +315548,8 @@ self: { pname = "vector-sized"; version = "1.5.0"; sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; - revision = "2"; - editedCabalFile = "1xck60sdci3vw39jp6qpbljhv06v43ih8bvxh6p40bwb6mxzn2wh"; + revision = "3"; + editedCabalFile = "1rj53ya87vnglqdnzfvb4w01k3g3wqkcc1i7ip2xryz6pw6vg18w"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -314704,8 +315693,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "4"; - editedCabalFile = "08pvbwy6cb2hb15wczqp9056rxj86f2kc972py4sj5adkmf9mzrj"; + revision = "5"; + editedCabalFile = "1mw2ssj6a772cvw2mf0r5qvz4blaq8k194p6bj0wnl1plr16r90b"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -315055,17 +316044,18 @@ self: { "versions" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , parser-combinators, tasty, tasty-hunit, text + , parser-combinators, tasty, tasty-hunit, template-haskell, text }: mkDerivation { pname = "versions"; - version = "6.0.1"; - sha256 = "1znrvdq2f1014pq0x16y264km4wbdy634xis2w5rhrdnp8l46ldy"; + version = "6.0.2"; + sha256 = "06wi1ir0h7jzcjgd1fq17ggjqh8zb3i3nyd79l0kdkjy7x39rysg"; libraryHaskellDepends = [ - base deepseq hashable megaparsec parser-combinators text + base deepseq hashable megaparsec parser-combinators + template-haskell text ]; testHaskellDepends = [ - base megaparsec microlens tasty tasty-hunit text + base megaparsec microlens tasty tasty-hunit template-haskell text ]; description = "Types and parsers for software version numbers"; license = lib.licenses.bsd3; @@ -316207,6 +317197,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_39" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, containers, deepseq, directory, filepath, microlens + , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.39"; + sha256 = "0x1j4m9gx8fdw651w6m49f91vjy98qkdxpr614z3nmf4sxzbpzp5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath microlens microlens-mtl microlens-th mtl + parsec stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -316288,8 +317303,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.5"; - sha256 = "0b2r0malnzalz0s59sa4ryyy1qg8ii886g15dhkmzcpz29yzwrc3"; + version = "3.26.1"; + sha256 = "0cfy3zgszbf56hw086fgprd45yh5hidrmbhsa07smy1r3rhynlda"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -316323,8 +317338,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10.2"; - sha256 = "1qn5k5p83p3lprksmscnb4ylychgfvfryvag9hkin3y2bzr8qwpm"; + version = "0.5.10.6"; + sha256 = "0xr9grpw0l7xhz2rs28kwdazvipghavcn3l6bcr1alb2axayv0rd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -316871,6 +317886,8 @@ self: { pname = "wai-handler-hal"; version = "0.2.0.0"; sha256 = "1skmwcs048h60nxq2wz2amaj148g1a6zk4vbnl17h6xi28s603lx"; + revision = "1"; + editedCabalFile = "0kdn4iv5fb0l4w4j2v4g9pyr2n56v4531k4xahysd2l034dyf6l7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -319830,8 +320847,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.7.0.0"; - sha256 = "18zhmdq53pkcg5c86fgjb7z6kql9f1bs33grgf714299vrl4dfak"; + version = "0.8.0.0"; + sha256 = "1qsywsshgj270zpzw5x5ljdmfy7v8vb8fmdqap118g4sci3ir3b8"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -320818,8 +321835,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.3.1"; - sha256 = "191bs505r33yhzb07vqk9rq16a5cajsh5rkg9h7k2c15v81mdc8s"; + version = "0.1.6.0"; + sha256 = "1f2vvhvm6r009c30rbb4b7sm57z1kvj9z9j5fwb8xzqqvkkc63hp"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -321064,8 +322081,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.5"; - sha256 = "02wl88sma18zhn1pav966kgldiwh942mws01qyp6nxgcx0p9i76s"; + version = "1.5.1"; + sha256 = "021i7ypxlz9lv0fkc1zkl4i6lydhy7jbq1w3565i8cdf4q7mlxrm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -321264,8 +322281,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "2"; - editedCabalFile = "1zq74zgh82zcxnn9knha6qn36k4sqm93mcck45h8pd6c7yzfc0jx"; + revision = "3"; + editedCabalFile = "13qxbck4ia474hlj1244awp2awjn3scppif3p1vwa3i92q6cf37g"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -321961,8 +322978,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; - revision = "2"; - editedCabalFile = "19l3d82cpw14ph253xhapvcm1f3pzik2nkrrvpizp3yx6hw049gn"; + revision = "3"; + editedCabalFile = "1g6qbs7lc6ng873ql5gflg62acn3pzy17dvck2hbxj02fdnjxlbr"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -323401,6 +324418,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -325497,8 +326516,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.4"; sha256 = "11aldkcd3lcxax42f4080127hqs1k95k84h5griwq27ig8gmbxdc"; - revision = "3"; - editedCabalFile = "0qfnwz5hfgzyw4a24jzgsshaipjm5bvybkz0gwpcw6zpid160p6n"; + revision = "4"; + editedCabalFile = "1b0426fb6nfb9rg118xnhn9m8fqayd23r09ybgr5r3sv0jgzjh2b"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -326219,6 +327238,8 @@ self: { pname = "xss-sanitize"; version = "0.3.7.2"; sha256 = "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"; + revision = "1"; + editedCabalFile = "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0"; libraryHaskellDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -327219,8 +328240,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.4"; - sha256 = "18h94h0pylgn4q6pzkhs3j5qchj9kafw09xh4kgdp2394b7xk4iy"; + version = "0.14.5"; + sha256 = "154k37qydkch91khxd52mfa6jv2k6gcxyiypcsnx3hcp88mfr9pm"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -328232,6 +329253,8 @@ self: { pname = "yesod-auth-oauth2"; version = "0.7.1.1"; sha256 = "1giac751jkygddf09a1h75dd4qv6kjjw5992447k53m1j398dpbn"; + revision = "1"; + editedCabalFile = "10m6k53idxr968595780v29kv9sjrp5irzv4b4bi10n3dxg85lf3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331452,7 +332475,9 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -331517,7 +332542,9 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; + broken = true; }) {}; "zeromq4-simple" = callPackage diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index fa6d2a20a9a23..f3a25e293d886 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -407,7 +407,9 @@ rec { self: super: let - haskellPaths = builtins.attrNames (builtins.readDir directory); + haskellPaths = + lib.filter (lib.hasSuffix ".nix") + (builtins.attrNames (builtins.readDir directory)); toKeyVal = file: { name = builtins.replaceStrings [ ".nix" ] [ "" ] file; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 753945ea6fc1d..c39c934bed643 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -625,4 +625,18 @@ in package-set { inherit pkgs lib callPackage; } self // { else pkg ) { }; + /* + Modify given Haskell package to force GHC to employ the LLVM + codegen backend when compiling. Useful when working around bugs + in a native codegen backend GHC defaults to. + + Example: + forceLlvmCodegenBackend tls + + Type: drv -> drv + */ + forceLlvmCodegenBackend = haskellLib.overrideCabal (drv: { + configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; + buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ]; + }); } diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index fa0446148b46e..f78e333ae1d78 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -7,6 +7,8 @@ # files. self: super: { + changelog-d = self.callPackage ../misc/haskell/changelog-d {}; + dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated @@ -36,4 +38,5 @@ self: super: { # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {}; + } diff --git a/pkgs/development/interpreters/babashka/completions/bb.bash b/pkgs/development/interpreters/babashka/completions/bb.bash new file mode 100644 index 0000000000000..9746fd02a0580 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.bash @@ -0,0 +1,5 @@ +_bb_tasks() { + COMPREPLY=( $(compgen -W "$(bb tasks |tail -n +3 |cut -f1 -d ' ')" -- ${COMP_WORDS[COMP_CWORD]}) ); +} +# autocomplete filenames as well +complete -f -F _bb_tasks bb diff --git a/pkgs/development/interpreters/babashka/completions/bb.fish b/pkgs/development/interpreters/babashka/completions/bb.fish new file mode 100644 index 0000000000000..36cf89fbced77 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.fish @@ -0,0 +1,9 @@ +function __bb_complete_tasks + if not test "$__bb_tasks" + set -g __bb_tasks (bb tasks |tail -n +3 |cut -f1 -d ' ') + end + + printf "%s\n" $__bb_tasks +end + +complete -c bb -a "(__bb_complete_tasks)" -d 'tasks' diff --git a/pkgs/development/interpreters/babashka/completions/bb.zsh b/pkgs/development/interpreters/babashka/completions/bb.zsh new file mode 100644 index 0000000000000..5082197405293 --- /dev/null +++ b/pkgs/development/interpreters/babashka/completions/bb.zsh @@ -0,0 +1,6 @@ +_bb_tasks() { + local matches=(`bb tasks |tail -n +3 |cut -f1 -d ' '`) + compadd -a matches + _files # autocomplete filenames as well +} +compdef _bb_tasks bb diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index ef9636e12deca..4c4cfd67dcdce 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -4,23 +4,24 @@ , removeReferencesTo , fetchurl , writeScript +, installShellFiles }: let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.185"; + version = "1.3.186"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-nTW7LpvWoF8hBWtpWOc8VtVvx3v1ISJGvxnnYIvprQk="; + sha256 = "sha256-T7inTJHSnUySituU0fcgZ0xWjIY3yb8BlSakqym67ew="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; executable = "bb"; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo installShellFiles ]; extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" @@ -42,6 +43,9 @@ let # graalvm-ce anyway. postInstall = '' remove-references-to -t ${graalvmDrv} $out/bin/${executable} + installShellCompletion --cmd bb --bash ${./completions/bb.bash} + installShellCompletion --cmd bb --zsh ${./completions/bb.zsh} + installShellCompletion --cmd bb --fish ${./completions/bb.fish} ''; passthru.updateScript = writeScript "update-babashka" '' diff --git a/pkgs/development/interpreters/babashka/wrapped.nix b/pkgs/development/interpreters/babashka/wrapped.nix index eb03045719f0a..29468265eb9c1 100644 --- a/pkgs/development/interpreters/babashka/wrapped.nix +++ b/pkgs/development/interpreters/babashka/wrapped.nix @@ -3,6 +3,7 @@ , babashka-unwrapped , callPackage , makeWrapper +, installShellFiles , rlwrap , clojureToolsBabashka ? callPackage ./clojure-tools.nix { } , jdkBabashka ? clojureToolsBabashka.jdk @@ -23,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in @@ -37,6 +38,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ --set-default JAVA_HOME ${jdkBabashka} + installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb '' + lib.optionalString withRlwrap '' substituteInPlace $out/bin/bb \ diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 56f5eb10b920a..bf81832f464b1 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.601"; + version = "0.603"; src = fetchFromGitHub { - owner = "Roblox"; + owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-RkclNY5ZDP0Urht/JBx00SbeQ958CJCTIru2YUIYFa4="; + hash = "sha256-8jm58F2AQcmjy19fydGLOD5fehaaNHGqXtDPu121jmw="; }; nativeBuildInputs = [ cmake ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua"; homepage = "https://luau-lang.org/"; - changelog = "https://github.com/Roblox/luau/releases/tag/${version}"; + changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/interpreters/lune/Cargo.lock b/pkgs/development/interpreters/lune/Cargo.lock deleted file mode 100644 index 2628328e33f4b..0000000000000 --- a/pkgs/development/interpreters/lune/Cargo.lock +++ /dev/null @@ -1,2902 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-compression" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[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.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", -] - -[[package]] -name = "blake3" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "cc", - "cfg-if", - "constant_time_eq 0.3.0", - "digest", -] - -[[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 = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" - -[[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 = "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 = "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 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[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 = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e25dfc584d06a3dbf775d207ff00d7de98d824c952dd2233dfbb261889a42" -dependencies = [ - "time 0.2.27", - "version_check", -] - -[[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-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[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 = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "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 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[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.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "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", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" - -[[package]] -name = "erased-serde" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" -dependencies = [ - "serde", -] - -[[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" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[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 = "full_moon" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9a9bf5e42aec08f4b59be1438d66b01ab0a0f51dca309626e219697b60871c" -dependencies = [ - "bytecount", - "cfg-if", - "derive_more", - "full_moon_derive", - "logos", - "paste", - "serde", - "smol_str", -] - -[[package]] -name = "full_moon_derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b4bd12ce56927d1dc5478d21528ea8c4b93ca85ff8f8043b6a5351a2a3c6f7" -dependencies = [ - "indexmap 1.9.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[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.23", -] - -[[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-core", - "futures-macro", - "futures-sink", - "futures-task", - "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 = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "glam" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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 = "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 = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tungstenite" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226df6fd0aece319a325419d770aa9d947defa60463f142cd82b329121f906a3" -dependencies = [ - "hyper", - "pin-project", - "tokio", - "tokio-tungstenite", - "tungstenite", -] - -[[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 = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "glob", - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - -[[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 = "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 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[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.3", - "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 = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[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 = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "logos" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" -dependencies = [ - "beef", - "fnv", - "proc-macro2", - "quote", - "regex-syntax 0.6.29", - "syn 1.0.109", -] - -[[package]] -name = "luau0-src" -version = "0.5.10+luau581" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8350fc82726c62f543b5b4e12611591b5c86dc38244af7c93c044c2cd0311d" -dependencies = [ - "cc", -] - -[[package]] -name = "lune" -version = "0.7.4" -dependencies = [ - "anyhow", - "async-compression", - "async-trait", - "console", - "dialoguer", - "directories", - "dunce", - "futures-util", - "hyper", - "hyper-tungstenite", - "lune-roblox", - "lz4_flex", - "mlua", - "once_cell", - "os_str_bytes", - "pin-project", - "rbx_cookie", - "reqwest", - "serde", - "serde_json", - "serde_yaml", - "tokio", - "tokio-tungstenite", - "toml", - "urlencoding", -] - -[[package]] -name = "lune-cli" -version = "0.7.4" -dependencies = [ - "anyhow", - "clap 4.3.11", - "console", - "directories", - "env_logger 0.10.0", - "full_moon", - "futures-util", - "include_dir", - "itertools", - "lune", - "once_cell", - "regex", - "reqwest", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "tokio", -] - -[[package]] -name = "lune-roblox" -version = "0.7.4" -dependencies = [ - "anyhow", - "glam", - "mlua", - "once_cell", - "rand", - "rbx_binary", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "rbx_xml", - "thiserror", -] - -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lz4_flex" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" -dependencies = [ - "twox-hash", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mlua" -version = "0.9.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b5bc62c9f83dc5c6bb36714e30aceca2fb3ac5c91a21590b0cf382b22e65e0" -dependencies = [ - "bstr", - "erased-serde", - "mlua-sys", - "num-traits", - "once_cell", - "rustc-hash", - "serde", - "serde-value", -] - -[[package]] -name = "mlua-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5013b291cbd5edd9259173f1ca1e62fc2f5b670c35424361acbbccddf9c679" -dependencies = [ - "cc", - "cfg-if", - "luau0-src", - "pkg-config", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -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 = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -dependencies = [ - "memchr", -] - -[[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 0.3.5", - "smallvec", - "windows-targets 0.48.1", -] - -[[package]] -name = "paste" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - -[[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 = "plist" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" -dependencies = [ - "base64 0.21.2", - "indexmap 1.9.3", - "line-wrap", - "quick-xml", - "serde", - "time 0.3.22", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -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 0.2.10", -] - -[[package]] -name = "rbx_binary" -version = "0.7.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "log", - "lz4", - "profiling", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "thiserror", -] - -[[package]] -name = "rbx_cookie" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d909d60469944842c9d204fa44afc90d9cb1e1f3f30a29bd1def490edd525a96" -dependencies = [ - "byteorder 0.5.3", - "clap 2.34.0", - "cookie", - "dirs", - "env_logger 0.9.3", - "log", - "plist", - "winapi", - "winreg", -] - -[[package]] -name = "rbx_dom_weak" -version = "2.4.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "rbx_types", - "serde", -] - -[[package]] -name = "rbx_reflection" -version = "4.2.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "rbx_types", - "serde", - "thiserror", -] - -[[package]] -name = "rbx_reflection_database" -version = "0.2.6+roblox-572" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "lazy_static", - "rbx_reflection", - "rmp-serde", - "serde", -] - -[[package]] -name = "rbx_types" -version = "1.5.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "blake3", - "lazy_static", - "rand", - "serde", - "thiserror", -] - -[[package]] -name = "rbx_xml" -version = "0.13.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "base64 0.13.1", - "log", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "xml-rs", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[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.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.7.3", -] - -[[package]] -name = "regex-automata" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.3", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.2", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.22.6", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder 1.4.3", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -dependencies = [ - "byteorder 1.4.3", - "rmp", - "serde", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq 0.1.5", - "crossbeam-utils", -] - -[[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 = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.17", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.1", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.167" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.167" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[package]] -name = "serde_json" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" -dependencies = [ - "indexmap 2.0.0", - "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 = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" -dependencies = [ - "indexmap 2.0.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[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 = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[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 = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[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 = "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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.23", - "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 = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros 0.2.9", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[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.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" -dependencies = [ - "autocfg", - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "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.23", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots 0.23.1", -] - -[[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", - "tracing", -] - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "indexmap 2.0.0", - "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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[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-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ - "byteorder 1.4.3", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "sha1 0.10.5", - "thiserror", - "url", - "utf-8", - "webpki", -] - -[[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.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[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 = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[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.23", - "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.23", - "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 = "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 = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.1", -] - -[[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.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.1", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -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]] -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[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.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.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.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.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 = "winnow" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9482fe6ceabdf32f3966bfdd350ba69256a97c30253dc616fe0005af24f164e" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xml-rs" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/development/interpreters/lune/default.nix index 96acddb98c69d..cb6f532e2bc96 100644 --- a/pkgs/development/interpreters/lune/default.nix +++ b/pkgs/development/interpreters/lune/default.nix @@ -8,22 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.7.4"; + version = "0.7.11"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; rev = "v${version}"; - hash = "sha256-um8XsXT0O+gTORrJAVlTku6YURh0wljLaQ7fueF+AoQ="; + hash = "sha256-5agoAXeO16/CihsgvUHt+pgA+/ph6PualTY6xqDQbeU="; fetchSubmodules = true; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rbx_binary-0.7.0" = "sha256-bwGCQMXN8VdycsyS7Om/9CKMkamAa0eBK2I2aPZ/sZs="; - }; - }; + cargoHash = "sha256-kPBPxlsicoFDyOsuJWhvQHDC2uwYQqpd7S+kQPRd8DY="; nativeBuildInputs = [ pkg-config @@ -33,6 +28,22 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + checkFlags = [ + # these all require internet access + "--skip=tests::net_request_codes" + "--skip=tests::net_request_compression" + "--skip=tests::net_request_methods" + "--skip=tests::net_request_query" + "--skip=tests::net_request_redirect" + "--skip=tests::net_socket_wss" + "--skip=tests::net_socket_wss_rw" + "--skip=tests::roblox_instance_custom_async" + "--skip=tests::serde_json_decode" + + # this tries to use the root directory as the CWD + "--skip=tests::process_spawn_cwd" + ]; + meta = with lib; { description = "A standalone Luau script runtime"; homepage = "https://github.com/filiptibell/lune"; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 9bb0a75b272a5..ab9128772d3cf 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -93,12 +93,12 @@ let # To avoid confusion later in passthru allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "8.3.0"; + version = "8.4.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-K0gRHLZ7MSgX5dHz4XH1utFRK7Bn4WdLnEspKBiVuXo="; + sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0="; }; buildInputs = [ diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 38ac50081423a..ba5ce5537bbbc 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -33,10 +33,12 @@ let , jq , version - , hash + , phpSrc ? null + , hash ? null , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) , phpAttrsOverrides ? (attrs: { }) + , pearInstallPhar ? (callPackage ./install-pear-nozlib-phar.nix { }) # Sapi flags , cgiSupport ? true @@ -192,6 +194,11 @@ let mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + + defaultPhpSrc = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit hash; + }; in stdenv.mkDerivation ( let @@ -278,6 +285,15 @@ let substituteInPlace configure --replace "-lstdc++" "-lc++" ''; + # When compiling PHP sources from Github, this file is missing and we + # need to install it ourselves. + # On the other hand, a distribution includes this file by default. + preInstall = '' + if [[ ! -f ./pear/install-pear-nozlib.phar ]]; then + cp ${pearInstallPhar} ./pear/install-pear-nozlib.phar + fi + ''; + postInstall = '' test -d $out/etc || mkdir $out/etc cp php.ini-production $out/etc/php.ini @@ -291,10 +307,7 @@ let $dev/share/man/man1/ ''; - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit hash; - }; + src = if phpSrc == null then defaultPhpSrc else phpSrc; patches = [ ./fix-paths-php7.patch ] ++ extraPatches; diff --git a/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix new file mode 100644 index 0000000000000..d359a7ed82aeb --- /dev/null +++ b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix @@ -0,0 +1,8 @@ +{ + fetchurl +}: + +fetchurl { + url = "https://pear.php.net/install-pear-nozlib.phar"; + hash = "sha256-UblKVcsm030tNSA6mdeab+h7ZhANNz7MkFf4Z1iigjs="; +} diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index b85f99a7b52d9..4e589cb722e18 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { passthru = { updateInfo = { - downloadPage = "http://www.software-lab.de/down.html"; + downloadPage = "https://www.software-lab.de/down.html"; }; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 9cd806c052333..b336caf6a0ada 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -56,11 +56,11 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) let buildPackages = pkgsBuildHost; - inherit (passthru) pythonForBuild; + inherit (passthru) pythonOnBuildForHost; - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + pythonOnBuildForHostInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else pythonForBuild.interpreter; + else pythonOnBuildForHost.interpreter; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -297,9 +297,9 @@ in with passthru; stdenv.mkDerivation ({ # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. - find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + lib.optionalString stdenv.hostPlatform.isCygwin '' cp libpython2.7.dll.a $out/lib ''; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 9ecc27fa1c725..8bc5c6c586d84 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -92,7 +92,7 @@ let openssl' = if openssl != null then openssl_legacy else null; buildPackages = pkgsBuildHost; - inherit (passthru) pythonForBuild; + inherit (passthru) pythonOnBuildForHost; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -127,7 +127,7 @@ let nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc - pythonForBuild + pythonOnBuildForHost ] ++ optionals (stdenv.cc.isClang && (!stdenv.hostPlatform.useAndroidPrebuilt or false) && (enableLTO || enableOptimizations)) [ stdenv.cc.cc.libllvm.out ]; @@ -148,9 +148,9 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + pythonOnBuildForHostInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else pythonForBuild.interpreter; + else pythonOnBuildForHost.interpreter; src = fetchurl { url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; @@ -388,7 +388,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ - "--with-build-python=${pythonForBuildInterpreter}" + "--with-build-python=${pythonOnBuildForHostInterpreter}" ] ++ optionals stdenv.hostPlatform.isLinux [ # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. @@ -511,9 +511,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. - find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + '' # *strip* shebang from libpython gdb script - it should be dual-syntax and # interpretable by whatever python the gdb in question is using, which may @@ -561,7 +561,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. - pythonForBuild buildPackages.bash + pythonOnBuildForHost buildPackages.bash ]; separateDebugInfo = true; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index ba51c43822d47..5aee357dd91b7 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -1,8 +1,8 @@ self: dontUse: with self; let - inherit (python) pythonForBuild; - pythonInterpreter = pythonForBuild.interpreter; + inherit (python) pythonOnBuildForHost; + pythonInterpreter = pythonOnBuildForHost.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; @@ -68,10 +68,10 @@ in { # set, but in downstream projects that build packages depending on other # versions of this hook's dependencies. passthru.tests = import ./pypa-build-hook-tests.nix { - inherit pythonForBuild runCommand; + inherit pythonOnBuildForHost runCommand; }; } ./pypa-build-hook.sh) { - inherit (pythonForBuild.pkgs) build; + inherit (pythonOnBuildForHost.pkgs) build; }; pipInstallHook = callPackage ({ makePythonHook, pip }: @@ -91,7 +91,7 @@ in { inherit pythonInterpreter pythonSitePackages; }; } ./pypa-install-hook.sh) { - inherit (pythonForBuild.pkgs) installer; + inherit (pythonOnBuildForHost.pkgs) installer; }; pytestCheckHook = callPackage ({ makePythonHook, pytest }: @@ -227,6 +227,6 @@ in { sphinxHook = callPackage ({ makePythonHook, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ]; + propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ]; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix index d909e34241f16..4153c21ca4f97 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -1,4 +1,4 @@ -{ pythonForBuild, runCommand }: { +{ pythonOnBuildForHost, runCommand }: { dont-propagate-conflicting-deps = let # customize a package so that its store paths differs mkConflict = pkg: pkg.overrideAttrs { some_modification = true; }; @@ -16,7 +16,7 @@ ''; in # this build must never triger conflicts - pythonForBuild.pkgs.buildPythonPackage { + pythonOnBuildForHost.pkgs.buildPythonPackage { pname = "dont-propagate-conflicting-deps"; version = "0.0.0"; src = projectSource; @@ -24,9 +24,9 @@ propagatedBuildInputs = [ # At least one dependency of `build` should be included here to # keep the test meaningful - (mkConflict pythonForBuild.pkgs.tomli) + (mkConflict pythonOnBuildForHost.pkgs.tomli) # setuptools is also needed to build the example project - pythonForBuild.pkgs.setuptools + pythonOnBuildForHost.pkgs.setuptools ]; }; } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index fbacf6bb23374..060b840ce227b 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -223,7 +223,7 @@ let ] ++ lib.optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { - inherit (python.pythonForBuild.pkgs.bootstrap) build; + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build; wheel = null; } else @@ -235,7 +235,7 @@ let ] ++ lib.optionals (format' != "other") [( if isBootstrapInstallPackage then pypaInstallHook.override { - inherit (python.pythonForBuild.pkgs.bootstrap) installer; + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer; } else pypaInstallHook @@ -279,7 +279,7 @@ let '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; outputs = outputs ++ lib.optional withDistOutput "dist"; diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 6cb906be0a51e..b06433113b6b3 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -91,9 +91,10 @@ in rec { pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; - # TODO: deprecate - # Not done immediately because its likely used outside Nixpkgs. - pythonForBuild = pythonOnBuildForHost_overridden; + # Remove after 24.11 is released. + pythonForBuild = + lib.warnIf (lib.isInOldestRelease 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`" + pythonOnBuildForHost_overridden; pythonOnBuildForHost = pythonOnBuildForHost_overridden; tests = callPackage ./tests.nix { diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index d42e4e85c102d..1a6f9c784cf67 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -224,7 +224,7 @@ let '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; outputs = outputs ++ lib.optional withDistOutput "dist"; diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index c67a8e0885149..8817d091a283a 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -8,7 +8,7 @@ makePythonHook { propagatedBuildInputs = [ makeWrapper ]; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; - substitutions.python = python.pythonForBuild; + substitutions.python = python.pythonOnBuildForHost; substitutions.pythonHost = python; substitutions.magicalSedExpression = let # Looks weird? Of course, it's between single quoted shell strings. diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4bbeb224ce3d9..b68c540b39cff 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -59,14 +59,14 @@ in stdenv.mkDerivation rec { buildPhase = with python3.pkgs; '' runHook preBuild - ${python.pythonForBuild.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES + ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; installPhase = with python3.pkgs; '' runHook preInstall - ${python.pythonForBuild.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} + ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} mkdir -p $out/share/renpy cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 5beac058eb905..ff9bb39e0a294 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -65,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch + ] ++ lib.optionals (lib.versionAtLeast version "91" && lib.versionOlder version "102") [ + # Fix 91 compatibility with python311 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mozjs91/raw/rawhide/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch"; + hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/starlark/default.nix b/pkgs/development/interpreters/starlark/default.nix index d6f0ffcbcca56..a387765f833d6 100644 --- a/pkgs/development/interpreters/starlark/default.nix +++ b/pkgs/development/interpreters/starlark/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "starlark"; - version = "unstable-2023-03-02"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "4b1e35fe22541876eb7aa2d666416d865d905028"; - hash = "sha256-TqR8V9cypTXaXlKrAUpP2qE5gJ9ZanaRRs/LmVt/XEo="; + rev = "556fd59b42f68a2fb1f84957741b72811c714e51"; + hash = "sha256-0IiEtZOQEvE2Qm//lI1eyFFL1q/ZQzO9JzmiGsk0HkQ="; }; - vendorHash = "sha256-mMxRw2VucXwKGQ7f7HM0GiQUExxN38qYZDdmEyxtXDA="; + vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 6aaecc9bd141a..79cad7fe64478 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake +{ lib, stdenv, mkDerivation, fetchurl, cmake, runtimeShell , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -20,6 +20,10 @@ mkDerivation rec { ./supercollider-3.12.0-env-dirs.patch ]; + postPatch = '' + substituteInPlace common/sc_popen.cpp --replace '/bin/sh' '${runtimeShell}' + ''; + strictDeps = true; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7b741b803de0b..d74ab371bb147 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -49,19 +49,21 @@ , audiofile , libiconv , withStatic ? false +# passthru.tests +, testers }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; version = "2.28.3"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; }; dontDisableStatic = if withStatic then 1 else 0; @@ -96,7 +98,7 @@ stdenv.mkDerivation rec { ++ lib.optionals x11Support [ libX11 ]; propagatedBuildInputs = lib.optionals x11Support [ xorgproto ] - ++ dlopenPropagatedBuildInputs; + ++ finalAttrs.dlopenPropagatedBuildInputs; dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] ++ lib.optional dbusSupport dbus @@ -109,7 +111,7 @@ stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] - ++ dlopenBuildInputs + ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; @@ -156,7 +158,7 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs); in lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -180,5 +185,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; + pkgConfigModules = [ "sdl2" ]; }; -} +}) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 3d599c39c05b5..83b57b42c7cd1 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }: +{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; @@ -42,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; + pkgConfigModules = [ "SDL2_gfx" ]; }; -} +}) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index d2dd8d53929ee..e46b9d9c537a9 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_ttf"; version = "2.20.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; homepage = "https://github.com/libsdl-org/SDL_ttf"; + pkgConfigModules = [ "SDL2_ttf" ]; }; -} +}) diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 81afbe4886cdd..b782dfbe0649a 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,14 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-03-07"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - # Last commit that compiles with Agda 2.6.3 - rev = "c6ee57a2da327def241324b4775ec2c67cdab2af"; - hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg="; + rev = "c6e0c3c714486fd6c89ace31443428ba48871685"; + hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc="; }; # We don't need anything in support; avoid installing LICENSE.agda diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index ff520fb85ef31..2b26a9562965b 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1a"; + version = "0.1.7.2"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; + sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c="; }; postPatch = '' diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 573b13d3b4f9d..fcc100e7a7bb4 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2022-01-14"; + version = "unstable-2023-10-04"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "3d143d6d0a3f75966602480665623e87233ff93e"; - hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; + rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; + hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; }; preConfigure = '' diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 1ecf4b843c74a..50ca17a10a25a 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k="; + hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8="; }; # The cubical library has several `Everything.agda` files, which are diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 083741d58e944..8d039701d97b5 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -26,5 +26,6 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; + broken = true; }; } diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 76f69f54d7191..10fd1034ebe2a 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; + hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/development/libraries/argparse/default.nix index a52dc730f73ef..16a4f3b7a21e0 100644 --- a/pkgs/development/libraries/argparse/default.nix +++ b/pkgs/development/libraries/argparse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argparse"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; rev = "v${version}"; - sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; + sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk="; }; postPatch = '' diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/development/libraries/boost-ext/boost-sml/default.nix index fd69db12d3c08..0383adca64a46 100644 --- a/pkgs/development/libraries/boost-ext/boost-sml/default.nix +++ b/pkgs/development/libraries/boost-ext/boost-sml/default.nix @@ -7,15 +7,13 @@ stdenv.mkDerivation rec { pname = "boost-sml"; - # This is first commit since 1.1.6 that passes all tests (test_policies_logging is commented out) - version = "1.1.6"; - working_tests = "24d762d1901f4f6afaa5c5e0d1b7b77537964694"; + version = "1.1.9"; src = fetchFromGitHub { owner = "boost-ext"; repo = "sml"; - rev = "${working_tests}"; - hash = "sha256-ZhIfyYdzrzPTAYevOz5I6tAcUiLRMV8HENKX9jychEY="; + rev = "v${version}"; + hash = "sha256-RYgSpnsmgZybpkJALIzxpkDRfe9QF2FHG+nA3msFaK0="; }; buildInputs = [ boost ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index ba5d96a95182b..4c0badf3df7ce 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,6 +1,6 @@ let version = "2.9.11"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext -, wordlists ? [ (fetchurl { +, lists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; }) ] @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs util '' + '' - ln -vs ${toString wordlists} dicts/ + ln -vs ${toString lists} dicts/ ''; postInstall = '' diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index c8bc708a2aa9f..5aac0850a74d2 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; + url = "https://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance templating engine"; - homepage = "http://ctpp.havoc.ru"; + homepage = "https://ctpp.havoc.ru/"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 04bbcf6e6b10b..c2799b97e2a5c 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-PdCjzLyc5O1rrTtPz8JD08unY7uMNS5fcD3ZLHJDeYg="; + hash = "sha256-ehybfwwMYMKPPeyv05zgDxmw0zr35eoY8wc/tb7DQw0="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index e9f0f013fe29f..a809eda31c0d1 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; - homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + homepage = "https://www.freedesktop.org/wiki/Software/dbus/"; changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index bf36c5a9bca0f..fb2db6a963e72 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , gettext @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.0"; + version = "0.28.1"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -27,9 +28,16 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-nEoLJWxSJmAonCbW/iZKjLrKMj09mwEaSUXUcUu8GxU="; + hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; + hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -67,8 +75,7 @@ stdenv.mkDerivation rec { "doc" ]; - # https://github.com/Exiv2/exiv2/issues/2762 - doCheck = lib.versionOlder brotli.version "1.1.0"; + doCheck = true; preCheck = '' patchShebangs ../test/ diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9d8f0fd823f42..4a346fdcffcd1 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index b223f249f83c6..0cfe4c7945895 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pkg-config texinfo ] ++ lib.optionals pythonSupport [ - python3.pythonForBuild + python3.pythonOnBuildForHost ncurses swig2 which diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index ec1f00cdc3683..d699701930809 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.1"; + version = "1.0.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw="; + hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 8aab8182becec..d6fe704401326 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -17,13 +17,13 @@ }: let - pythonEnv = python3.pythonForBuild.withPackages (ps: with ps; [ + pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ]); in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.7"; + version = "0.4.8"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-E0H3MqNxYXP40wKMcI1cwLKWGVOnPNazbH6K3TbzpCQ="; + hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; }; patches = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index b1e09f7b82ed1..88f373dd4afad 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -30,14 +30,15 @@ , gtk4 , mapnik , qt5 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; version = "7.3.0"; src = fetchurl { - url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; + url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs="; }; @@ -103,6 +104,9 @@ stdenv.mkDerivation rec { passthru.tests = { inherit gimp gtk3 gtk4 mapnik; inherit (qt5) qtbase; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -112,5 +116,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ + "harfbuzz" + "harfbuzz-gobject" + "harfbuzz-subset" + ]; }; -} +}) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 91118946a182b..dbaa4888922c5 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, python3, hunspell }: let @@ -934,4 +934,37 @@ rec { readmeFile = "README_pt_PT.txt"; license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; + + /* PERSIAN */ + + fa_IR = fa-ir; + fa-ir = mkDict { + pname = "hunspell-dict-fa-ir"; + version = "experimental-2022-09-04"; + dictFileName = "fa-IR"; + readmeFile = "README.md"; + src = fetchFromGitHub { + owner = "b00f"; + repo = "lilak"; + rev = "1a80a8e5c9377ac424d29ef20be894e250bc9765"; + hash = "sha256-xonnrclzgFEHdQ9g8ijm0bo9r5a5Y0va52NoJR5d8mo="; + }; + nativeBuildInputs = [ python3 ]; + buildPhase = '' + runHook preBuild + mkdir build + (cd src && python3 lilak.py) + mv build/* ./ + # remove timestamp from file + sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff + runHook postBuild + ''; + meta = with lib; { + description = "Hunspell dictionary for Persian (Iran)"; + homepage = "https://github.com/b00f/lilak"; + license = licenses.asl20; + maintainers = with maintainers; [ nix-julia ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index cb014ed80bf9b..68028849b639c 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "23.1.6"; + version = "23.3.5"; outputs = [ "out" "dev" ]; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-Z1xBU+4SdwknXpYUS8EwEURNIsg2+R/U0CcW3FW325M="; + hash = "sha256-7OdLpqO2evNeyxceOtHEI7sJCVybqvrcM1ZZx8bI4xw="; }; patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4="; }) ]; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 7a68f130663d5..fa5d2b3b0c99f 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isAarch64 zlib; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.io/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index a7901466081b0..b3ef27e38774e 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ OpenGL Cocoa IOKit ]; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.net/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.darwin; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index b3087f0abea7b..64695aaa55d72 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; - homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; platforms = lib.platforms.all; license = lib.licenses.mpl20; }; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 90853d5f2db42..c8db600dce810 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wrapper library for evdev devices"; - homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; + homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.amorsillo ]; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index d789aafbcb4e4..f5fbf21f94fd7 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, python , qtbase , darwin }: @@ -25,8 +26,8 @@ stdenv.mkDerivation { hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc="; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; - buildInputs = [ eigen zlib libpng boost guile qtbase ] + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; + buildInputs = [ eigen zlib libpng boost guile python qtbase ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' @@ -42,6 +43,14 @@ stdenv.mkDerivation { --replace "LIBFIVE_STDLIB_DIR=$<TARGET_FILE_DIR:libfive-stdlib>" \ "LIBFIVE_STDLIB_DIR=$out/lib" + substituteInPlace libfive/bind/python/CMakeLists.txt \ + --replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \ + " $out/${python.sitePackages}" \ + + substituteInPlace libfive/bind/python/libfive/ffi.py \ + --replace "os.path.join('libfive', folder)" \ + "os.path.join('$out/${python.sitePackages}/libfive', folder)" \ + export XDG_CACHE_HOME=$(mktemp -d)/.cache ''; @@ -63,12 +72,29 @@ stdenv.mkDerivation { '' + '' # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" + + # Create links since libfive looks for the library in a specific path. + mkdir -p "$out/${python.sitePackages}/libfive/src" + ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/" + mkdir -p "$out/${python.sitePackages}/libfive/stdlib" + ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/" + + # Create links so Studio can find the bindings. + mkdir -p "$out/libfive/bind" + ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python" ''; + pythonImportsCheck = [ + "libfive" + "libfive.runner" + "libfive.shape" + "libfive.stdlib" + ]; + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = "https://libfive.com/"; - maintainers = with maintainers; [ hodapp kovirobi ]; + maintainers = with maintainers; [ hodapp kovirobi wulfsta ]; license = with licenses; [ mpl20 gpl2Plus ]; platforms = with platforms; all; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 75c9beea9b98c..1e35d4124615c 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-DPYTHON_BINDINGS=${onOff pythonSupport}" "-DDOCUMENTATION=${onOff docSupport}" ] ++ lib.optionals pythonSupport [ - "-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}" + "-DPYTHON_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}" "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}" ]; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index a508593bc49f2..37c5efc5d069f 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gi-docgen gobject-introspection diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 2cb8642ca87ef..35ffc46ec618d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; nativeInstallCheckInputs = [ # running libical-glib tests - (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ + (python3.pythonOnBuildForHost.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 98ca22d2e90d7..8adc015120400 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" ] ++ lib.optionals pythonSupport [ - "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" "-DPYTHON_BINDINGS=on" ] ++ lib.optionals (!avahiSupport) [ "-DHAVE_DNS_SD=OFF" diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 62ddcd673900c..5c7a316250232 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; - homepage = "http://libproxy.github.io/libproxy/"; + homepage = "https://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 14e730d69e52f..b4eeed32d5967 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A modern and easy-to-use crypto library"; - homepage = "http://doc.libsodium.org/"; + homepage = "https://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; pkgConfigModules = [ "libsodium" ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 76931b12fc005..4b40eacaa0312 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.25"; + version = "0.7.26"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-OSYfv8dTyoa2f1T/zCEruKczickP5jS05xjYLQQiFaY="; + sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 3e77d0876be89..636b3ac2b0f41 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.skeidel ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch index 3ecdf75f06f8c..3ecdf75f06f8c 100644 --- a/pkgs/development/libraries/libtickit/skipTestMacOS.patch +++ b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/development/libraries/libtickit/default.nix index 4b5296c895666..54386e57a0acf 100644 --- a/pkgs/development/libraries/libtickit/default.nix +++ b/pkgs/development/libraries/libtickit/default.nix @@ -7,9 +7,12 @@ , libtermkey , unibilium }: -stdenv.mkDerivation rec { - pname = "libtickit"; +let version = "0.4.3"; +in +stdenv.mkDerivation { + pname = "libtickit"; + inherit version; src = fetchFromGitHub { owner = "leonerd"; @@ -18,25 +21,33 @@ stdenv.mkDerivation rec { hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; }; - makeFlags = [ - "PREFIX=$(out)" - "LIBTOOL=${lib.getExe libtool}" + patches = [ + # Disabled on darwin, since test assumes TERM=linux + ./001-skip-test-18term-builder-on-macos.patch ]; nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + nativeCheckInputs = [ perl ]; - patches = [ - ./skipTestMacOS.patch + makeFlags = [ + "LIBTOOL=${lib.getExe libtool}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 75773296fab26..c8e00cf4a9419 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; + homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 658a24b8d8145..c36e3116dad64 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.7.0"; + version = "9.9.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-7huo2UsbNG/HG2dpdVT5qcJuFmYZE6Jdave8Gb1kHME="; + sha256 = "sha256-8Tmn99wDkRoA+pnOjeCzHoCeR3P3MwCA1kqY6SZpkqw="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index bc9e2c8c2c1d5..3f8e27789b8ce 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -83,7 +83,7 @@ libxml = stdenv.mkDerivation rec { (lib.enableFeature enableShared "shared") (lib.withFeature icuSupport "icu") (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ]; installFlags = lib.optionals pythonSupport [ diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 3a5c89557459a..356f87ff264b5 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--without-mem-debug" "--without-debugger" (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ] ++ lib.optionals (!cryptoSupport) [ "--without-crypto" ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 1e1ec46739eb3..b98f5066dae51 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -18,7 +18,7 @@ }: let - pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]); + pythonEnv = python3.pythonOnBuildForHost.withPackages (p: with p; [ pyyaml setuptools ]); in stdenv.mkDerivation rec { pname = "lirc"; diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 3711e2d2b4ff5..18793114c2190 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.4"; - hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; + version = "2.28.5"; + hash = "sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index 01df03bbbadbc..ca069cca1ead2 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.4.1"; - hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; + version = "3.5.0"; + hash = "sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU="; } diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 4eba7cbbd8e28..f5efbdcc082ef 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R+PvD7E/z+Gc7h2y0pUYaCkzfgpxzwToOr4pKSrOnxU="; + sha256 = "sha256-bRlz5RW+NUSTgzjRM9alZjSrzmF8/7p4IIXqK/HEcJo="; }; strictDeps = true; diff --git a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch new file mode 100644 index 0000000000000..7d1723c3ef98c --- /dev/null +++ b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60c699d..606b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -402,7 +402,7 @@ ELSE(MSVC) + FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ENDIF(MSVC) + +-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) ++CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY) + IF(NOT HAVE_H5FREE_MEMORY) + MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") + SET(NC_HAS_DEF_VAR_FILTER "") diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 5f0fade2566e1..945eb219229ff 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; + patches = [ + # This fix is included upstream, remove with next upgrade + ./cmake-h5free.patch + ]; + preConfigure = '' cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)" ''; @@ -28,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 201bf16ad6476..2bfb087085882 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.4"; src = fetchFromGitHub { - owner = "ofxa"; + owner = "AcademySoftwareFoundation"; repo = "openfx"; rev = "OFX_Release_1_4_TAG"; sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Image processing plug-in standard"; - homepage = "http://openeffects.org/"; + homepage = "https://openeffects.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 06d65be106daf..b0ff4b528864b 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation rec { "-DNO_OPENCL=1" ]; + preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' + # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1313 + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) + ''; + postInstall = "rm $out/lib/*.a"; meta = { diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 33ca032672703..92b6ae003fca7 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = "http://nhartland.github.io/APFELgrid/"; + homepage = "https://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 89cb4cf38f7ef..37dea2ece86a8 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals (enableDocs || enableGI) [ doxygen - (python3.pythonForBuild.withPackages (ps: with ps; + (python3.pythonOnBuildForHost.withPackages (ps: with ps; lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index c23bfe2ebeb84..80badcdd4dbde 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus - (python3.pythonForBuild.withPackages (pp: with pp; [ + (python3.pythonOnBuildForHost.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { # Avoid dependency cycle. @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/polkit"; + homepage = "https://gitlab.freedesktop.org/polkit/polkit/"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 589cf7cdf95c0..a109aad97b9d4 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "190700_20210406"; src = fetchurl { - url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + url = "https://files.portaudio.com/archives/pa_stable_v${version}.tgz"; sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable cross-platform Audio API"; - homepage = "http://www.portaudio.com/"; + homepage = "https://www.portaudio.com/"; # Not exactly a bsd license, but alike license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 378b6babd7274..a18df6a4a7869 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Swordfish90/qmltermwidget"; license = lib.licenses.gpl2; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index de80fc0709d3a..860e39227513a 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.1"; + version = "6.13.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc="; + hash = "sha256-Kdvr3T9hynLCj99+Rc1L0Gq7xkiM0a6xovuqhAncrek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch b/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch new file mode 100644 index 0000000000000..df334cc912642 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch @@ -0,0 +1,35 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 11c1b04c..762eaa75 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,20 +1,14 @@ +-find_package(GTestSrc) ++enable_testing() + +-IF(GTESTSRC_FOUND) +- enable_testing() ++if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) ++ set(gtest_disable_pthreads ON) ++ set(gtest_force_shared_crt ON) ++endif() + +- if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) +- set(gtest_disable_pthreads ON) +- set(gtest_force_shared_crt ON) +- endif() ++include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) +- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) ++set(TEST_LIBRARIES gtest gtest_main) + +- set(TEST_LIBRARIES gtest gtest_main) +- +- add_custom_target(tests ALL) +- add_subdirectory(perftest) +- add_subdirectory(unittest) +- +-ENDIF(GTESTSRC_FOUND) ++add_custom_target(tests ALL) ++add_subdirectory(perftest) ++add_subdirectory(unittest) diff --git a/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch b/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch new file mode 100644 index 0000000000000..dd06ba6a69711 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch @@ -0,0 +1,36 @@ +diff --git a/test/valgrind.supp b/test/valgrind.supp +index c9d3d226..63af7bf9 100644 +--- a/test/valgrind.supp ++++ b/test/valgrind.supp +@@ -24,3 +24,31 @@ + fun:*Uri*Parse_UTF16_Std* + } + ++{ ++ Suppress memcpy_chk valgrind report 5 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_normal* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 6 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_maxDecimalPlaces* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 7 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ ... ++ fun:*Reader*ParseDoubleHandler* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 8 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*Reader*ParseNumber_NormalPrecisionError* ++} diff --git a/pkgs/development/libraries/rapidjson/unstable.nix b/pkgs/development/libraries/rapidjson/unstable.nix index 069f1a48e0ea7..0f4c3d40403e1 100644 --- a/pkgs/development/libraries/rapidjson/unstable.nix +++ b/pkgs/development/libraries/rapidjson/unstable.nix @@ -1,17 +1,30 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, pkg-config , cmake +, doxygen +, graphviz , gtest , valgrind +# One of "11" or "17"; default in source is CXX 11 +, cxxStandard ? "11" +, buildDocs ? true +, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin +, buildExamples ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rapidjson"; version = "unstable-2023-09-28"; + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildExamples [ + "example" + ]; + src = fetchFromGitHub { owner = "Tencent"; repo = "rapidjson"; @@ -19,26 +32,44 @@ stdenv.mkDerivation rec { hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY="; }; + patches = lib.optionals buildTests [ + ./0000-unstable-use-nixpkgs-gtest.patch + # https://github.com/Tencent/rapidjson/issues/2214 + ./0001-unstable-valgrind-suppress-failures.patch + ]; + nativeBuildInputs = [ - pkg-config cmake + ] ++ lib.optionals buildDocs [ + doxygen + graphviz ]; - patches = [ - (fetchpatch { - name = "do-not-include-gtest-src-dir.patch"; - 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="; - }) + cmakeFlags = [ + (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) + (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) + (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11")) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17")) + ] ++ lib.optionals buildTests [ + (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") + ]; + + doCheck = buildTests; + + nativeCheckInputs = [ + gtest + valgrind ]; - # for tests, adding gtest to checkInputs does not work - # https://github.com/NixOS/nixpkgs/pull/212200 - buildInputs = [ gtest ]; - cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ]; + postInstall = lib.optionalString buildExamples '' + mkdir -p $example/bin - nativeCheckInputs = [ valgrind ]; - doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; + find bin -type f -executable \ + -not -name "perftest" \ + -not -name "unittest" \ + -exec cp -a {} $example/bin \; + ''; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; @@ -46,5 +77,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ Madouura ]; + broken = (cxxStandard != "11" && cxxStandard != "17"); }; -} +}) diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index a7c388339de0d..349c3be82b969 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python - ${python3Packages.python.pythonForBuild.interpreter} setup.py build - ${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out ''; postFixup = '' diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index b1e03e35df12c..b9f101d80fa30 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -153,8 +153,14 @@ in description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; sourceProvenance = with sourceTypes; [binaryNativeCode]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; + license = { + shortName = "cuDNN EULA"; + fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + } // lib.optionalAttrs (!useCudatoolkitRunfile) { + redistributable = true; + }; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; # Force the use of the default, fat output by default (even though `dev` exists, which diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9b26b352cdad8..cea4d5b4c6faa 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8="; + sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c5c7b7e6427db..d1df264564471 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,6 +1,7 @@ { lib , backendStdenv , fetchFromGitHub +, python3 , which , autoAddOpenGLRunpathHook , cuda_cccl @@ -17,13 +18,13 @@ let in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl"; - version = "2.18.5-1"; + version = "2.19.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,7 @@ backendStdenv.mkDerivation (finalAttrs: { which autoAddOpenGLRunpathHook cuda_nvcc + python3 ]; buildInputs = [ @@ -46,7 +48,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' - patchShebangs src/collectives/device/gen_rules.sh + patchShebangs ./src/device/generate.py makeFlagsArray+=( "NVCC_GENCODE=${gencode}" ) @@ -77,7 +79,7 @@ backendStdenv.mkDerivation (finalAttrs: { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter orivej ]; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; }; }) diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix index 69e45a6aee093..9d826b92f164a 100644 --- a/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,40 +1,47 @@ -{ config -, cudaPackages +{ backendStdenv +, config +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaVersion , fetchFromGitHub +, gitUpdater , lib -, mpiSupport ? false , mpi -, stdenv +, mpiSupport ? false +, nccl , which }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.6"; + version = "2.13.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw="; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; }; strictDeps = true; nativeBuildInputs = [ - cudaPackages.cuda_nvcc + cuda_nvcc which ]; buildInputs = [ - cudaPackages.cuda_cudart - cudaPackages.nccl + cuda_cudart + nccl + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ] ++ lib.optional mpiSupport mpi; makeFlags = [ - "CUDA_HOME=${cudaPackages.cuda_nvcc}" - "NCCL_HOME=${cudaPackages.nccl}" + "CUDA_HOME=${cuda_nvcc}" + "NCCL_HOME=${nccl}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; @@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { cp -r build/* $out/bin/ ''; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.bsd3; broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ]; + maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; }; }) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 8f0c930eff62b..5cbc235898958 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation rec { "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" - "-DPython3_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook pkg-config - python.pythonForBuild + python.pythonOnBuildForHost swig4 unzip - ] ++ (with python.pythonForBuild.pkgs; [ + ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf ]); diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f2f9b6ec8859f..b9f34eeb9748d 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.16"; + version = "1.13.17"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; + sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 16a68ed67ea07..d160a6a5f6dc6 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -36,6 +36,7 @@ , wayland-protocols , wayland-scanner , zlib +, wrapGAppsHook , withPolkit ? stdenv.isLinux }: @@ -88,18 +89,16 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala + wrapGAppsHook ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; - propagatedBuildInputs = [ + buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ]; - - buildInputs = [ cyrus_sasl libepoxy gtk3 diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 001123ead60f6..c1c5819ad4219 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libxcb xcbutil ]; meta = { - homepage = "http://www.freedesktop.org/software/startup-notification"; + homepage = "https://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; license = lib.licenses.lgpl2; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index cae222f92f1ef..c8c220927fa48 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { wrapGAppsNoGuiHook gi-docgen graphviz - (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gobject-introspection vala diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index ff43ef249ea80..9df3196ee1fe1 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-oCDsvpH9P5onME/t+o7VGttk1cHUpneODz21/0RkVkk="; + sha256 = "sha256-x/Chzho6RTfyOb/Is7bAM8KrvipEqQ/+a6pVCuTG108="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 8b86df2e1c100..e7e818cbea5da 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; + homepage = "https://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 098dc64cf1548..48b075add0b2d 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,23 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, libtiff +, expat +, zlib +, libpng +, libjpeg +}: + +stdenv.mkDerivation (finalAttrs: { pname = "vxl"; version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ libtiff expat zlib libpng libjpeg ]; + nativeBuildInputs = [ + cmake + unzip + ]; + buildInputs = [ + libtiff + expat + zlib + libpng + libjpeg + ]; + + # test failure on aarch64-linux; unknown reason: + cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; + + doCheck = true; meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "https://vxl.sourceforge.net/"; - license = "VXL License"; - maintainers = with lib.maintainers; [viric]; + homepage = "https://vxl.sourceforge.net"; + # license appears contradictory; see https://github.com/vxl/vxl/issues/752 + # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) + license = [ lib.licenses.unfree ]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 2c1e15bfbef3f..b0f9ce53e72e6 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitLab +{ lib +, stdenv +, fetchFromGitLab , darwin , abseil-cpp , meson @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 35280e4b5eb3c..ceb5bf0303b86 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , Security , autoreconfHook , util-linux @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; }; + patches = [ + (fetchpatch { + name = "fix-expected-test-response.patch"; + url = "https://github.com/wolfSSL/wolfssl/commit/ca694938fd053a8557f9f08b1b4265292d8bef65.patch"; + hash = "sha256-ETxszjjEMk0WdYgXHWTxTaWZPpyDs9jdko0jtkjzgwI="; + }) + ]; + postPatch = '' patchShebangs ./scripts # ocsp stapling tests require network access, so skip them @@ -46,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-bigcache" # Use WolfSSL's Single Precision Math with timing-resistant cryptography. - "--enable-sp=yes${lib.optionalString (!stdenv.isx86_32) ",asm"}" + "--enable-sp=yes${lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"}" "--enable-sp-math-all" "--enable-harden" ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ diff --git a/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix b/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix index 42afb6d27066a..31a53b0f949b5 100644 --- a/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix @@ -33,7 +33,7 @@ let pname = "bordeaux-threads"; version = "0.8.8"; src = pkgs.fetchzip { - url = "http://github.com/sionescu/bordeaux-threads/archive/v0.8.8.tar.gz"; + url = "https://github.com/sionescu/bordeaux-threads/archive/v0.8.8.tar.gz"; sha256 = "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6"; }; lisp = sbcl; diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index 847368229c6f9..49f33e016ed5b 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "datafusion-cli"; - version = "31.0.0"; + version = "32.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; rev = version; - sha256 = "sha256-Y7T3jFvdQbbvrNz+BITauDoNBsQCoXGV8Sgtgw3Brnc="; + sha256 = "sha256-QJOv2neEOxLvWoGuS3QyBqGOBi1KJQ8feK6LOrHBL8g="; }; sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-hLAfByc5tnRPTE4iydlFgqc098fSrvIauiAykoU09u0="; + cargoHash = "sha256-NYdxDFUBOBC3nTZB8STdZfOz3Dw0htFCqE0qBRMzQvw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/misc/haskell/changelog-d/changelog-d.nix b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix new file mode 100644 index 0000000000000..7abc707540ce4 --- /dev/null +++ b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix @@ -0,0 +1,30 @@ +{ mkDerivation, base, bytestring, cabal-install-parsers +, Cabal-syntax, containers, directory, fetchgit, filepath +, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty +, regex-applicative +}: +mkDerivation { + pname = "changelog-d"; + version = "0.1"; + src = fetchgit { + url = "https://codeberg.org/fgaz/changelog-d"; + sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; + rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cabal-install-parsers Cabal-syntax containers + directory filepath generic-lens-lite mtl parsec pretty + regex-applicative + ]; + executableHaskellDepends = [ + base bytestring Cabal-syntax directory filepath + optparse-applicative + ]; + doHaddock = false; + description = "Concatenate changelog entries into a single one"; + license = lib.licenses.gpl3Plus; + mainProgram = "changelog-d"; +} diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix new file mode 100644 index 0000000000000..e4ba565808cf6 --- /dev/null +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -0,0 +1,51 @@ +{ callPackage +, lib +, pkgs +}: + +(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: { + + version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; + + passthru.updateScript = lib.getExe (pkgs.writeShellApplication { + name = "update-changelog-d"; + runtimeInputs = [ + pkgs.cabal2nix + ]; + text = '' + cd pkgs/development/misc/haskell/changelog-d + cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix + ''; + }); + passthru.tests = { + basic = pkgs.runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } '' + mkdir changelogs + cat > changelogs/config <<EOF + organization: NixOS + repository: boondoggle + EOF + cat > changelogs/a <<EOF + synopsis: Support numbers with incrementing base-10 digits + issues: #1234 + description: { + This didn't work before. + } + EOF + changelog-d changelogs >$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x + ''; + }; + + meta = oldAttrs.meta // { + homepage = "https://codeberg.org/fgaz/changelog-d"; + maintainers = [ lib.maintainers.roberth ]; + }; + +}) diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index d162753608bdc..8aed144ff65c2 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -31,13 +31,36 @@ stdenv.mkDerivation (finalAttrs: { # newlib expects CC to build for build platform, not host platform preConfigure = '' export CC=cc + '' + + # newlib tries to disable itself when building for Linux *except* + # when native-compiling. Unfortunately the check for "is cross + # compiling" was written when newlib was part of GCC and newlib + # was built along with GCC (therefore newlib was built to execute + # on the targetPlatform, not the hostPlatform). Unfortunately + # when newlib was extracted from GCC, this "is cross compiling" + # logic was not fixed. So we must disable it. + '' + substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs' ''; + configurePlatforms = [ "build" "target" ]; # flags copied from https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53310/gcc-arm-none-eabi-what-were-the-newlib-compilation-options # sort alphabetically configureFlags = [ - "--host=${stdenv.buildPlatform.config}" + "--with-newlib" + + # The newlib configury uses `host` to refer to the platform + # which is being used to compile newlib. Ugh. It does this + # because of its history: newlib used to be distributed with and + # built as part of gcc. + # + # To prevent nixpkgs from going insane, this package presents the + # "normal" view to the outside world: the binaries in $out will + # execute on `stdenv.hostPlatform`. We then fool newlib's build + # process into doing the right thing. + "--host=${stdenv.targetPlatform.config}" + ] ++ (if !nanoizeNewlib then [ "--disable-newlib-supplied-syscalls" "--disable-nls" diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index d503bda78762b..f670f79a8bee5 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1qbva38lcy1rm5k6r207hk3nqrr07h7x9sdppz4w5f37q0ll986r"; + sha256 = "0whnhcf7a3j01693254qqwfk9d3xa4icv4kyqkn4ihxyibznb91d"; }; dontUnpack = true; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0bfe127efff40..97013e58554c1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -99,6 +99,7 @@ mapAliases { manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 + inherit (pkgs) mathjax-node-cli; # added 2023-11-02 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 inherit (pkgs) mermaid-cli; # added 2023-10-01 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 471b37c30bf07..56b4337509611 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -166,7 +166,6 @@ , "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 168d6b0c3c2a5..5963f7ebdf4f4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -86763,212 +86763,6 @@ 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.1.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.1" - 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.18.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/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 8358be50032a1..ed7f2ef559edf 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -9,31 +9,15 @@ buildDunePackage rec { pname = "pyml"; - version = "20220905"; + version = "20231101"; src = fetchFromGitHub { owner = "thierry-martinez"; repo = "pyml"; rev = version; - sha256 = "PL4tFIKQLRutSn9Sf84/ImJv0DqkstNnJaNBqWDTKDQ="; + sha256 = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc="; }; - patches = [ - # Fixes test crash. - # https://github.com/thierry-martinez/pyml/issues/85 - (fetchpatch { - url = "https://github.com/thierry-martinez/pyml/commit/a0bc5aca8632bea273f869d622cad2f55e754a7c.patch"; - sha256 = "bOqAokm5DE5rlvkBMQZtwMppRmoK9cvjJeGeP6BusnE="; - excludes = [ - "CHANGES.md" - ]; - }) - (fetchpatch { - url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; - hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; - }) - ]; - buildInputs = [ utop ]; @@ -44,7 +28,8 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - python3.pkgs.numpy python3.pkgs.ipython + python3.pkgs.numpy + python3.pkgs.ipython ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/semver/default.nix b/pkgs/development/ocaml-modules/semver/default.nix index 15bd02f186872..5f4880c0cf2ef 100644 --- a/pkgs/development/ocaml-modules/semver/default.nix +++ b/pkgs/development/ocaml-modules/semver/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") - "semver is not available on OCaml older than 4.02" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-semver"; - version = "0.1.0"; - src = fetchzip { - url = "https://github.com/rgrinberg/ocaml-semver/archive/v${version}.tar.gz"; - sha256 = "sha256-0BzeuVTpuRIQjadGg08hTvMzZtKCl2utW2YK269oETk="; +buildDunePackage rec { + pname = "semver"; + version = "0.2.1"; + src = fetchurl { + url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${version}/semver-${version}.tbz"; + hash = "sha256-CjzDUtoe5Hvt6zImb+EqVIulRUUUQd9MmuJ4BH/2mLg="; }; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - - strictDeps = true; - createFindlibDestdir = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/rgrinberg/ocaml-semver"; description = "Semantic versioning module"; - platforms = ocaml.meta.platforms; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 70f0be8c7af89..b260d946ce1e7 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -9,12 +9,12 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-zarith"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "ocaml"; repo = "Zarith"; rev = "release-${version}"; - sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; + sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; - homepage = "http://forge.ocamlcore.org/projects/zarith"; + homepage = "https://github.com/ocaml/Zarith"; + changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; diff --git a/pkgs/development/php-packages/memprof/default.nix b/pkgs/development/php-packages/memprof/default.nix new file mode 100644 index 0000000000000..04ef8e6be590b --- /dev/null +++ b/pkgs/development/php-packages/memprof/default.nix @@ -0,0 +1,33 @@ +{ buildPecl +, lib +, fetchFromGitHub +, judy +}: + +let + version = "3.0.2"; +in buildPecl { + inherit version; + pname = "memprof"; + + src = fetchFromGitHub { + owner = "arnaud-lb"; + repo = "php-memory-profiler"; + rev = version; + hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA="; + }; + + configureFlags = [ + "--with-judy-dir=${judy}" + ]; + + doCheck = true; + + meta = { + changelog = "https://github.com/arnaud-lb/php-memory-profiler/releases/tag/${version}"; + description = "Memory profiler for PHP. Helps finding memory leaks in PHP scripts"; + homepage = "https://github.com/arnaud-lb/php-memory-profiler"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gaelreyrol ]; + }; +} diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index b685b5ff14ba5..24ed871c4037a 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonAtLeast , pythonOlder , pytestCheckHook @@ -29,6 +30,15 @@ buildPythonPackage rec { hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; }; + patches = [ + # https://github.com/huggingface/accelerate/pull/2121 + (fetchpatch { + name = "fix-import-error-without-torch_distributed.patch"; + url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; + hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index ca9fab212cae8..d8d82edb8a315 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; + hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 4b301548b43c0..e433aa425994a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.75"; + version = "9.2.76"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k3CX0ntqbKBL9xLTPifwjTqwYEDLlNdEHlIPiokkkPA="; + hash = "sha256-RIYGWPvQ2n+NgZHw2pGEvgWAtbpb/rdyb6/K4JClRxM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index 8aca66a80b4c6..79a07c06e9e97 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aioelectricitymaps"; rev = "refs/tags/v${version}"; - hash = "sha256-Whg3F4Oyfqn2Lod44e15Pxc3m0dEB2F+MK0bvEM7c7w="; + hash = "sha256-XJw3oy5IHyXmdoVxSU15dWHcc4Wd435Lyr/wpz53aZI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index ca577acc2834a..9af84e2ff91a5 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.2.1"; + version = "18.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PW3/V4PTm+UxTsfSSvOEX+FGcuF4m+mDOz6Z/AzB2qk="; + hash = "sha256-jSPoVMtGRtqpDFagjvLTxps5plcN92Mp9vjtQlmqyGg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 80bc2b2a05257..e26c6eb53bd95 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE="; + hash = "sha256-b462OZzRS9aldfJ+4ztczxbCMK76UM0pSOI1cIi1NM8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 5b142f2be1eaa..e3d0f02711427 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.75"; + version = "9.2.76"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-tDOO0wn5gYxK1CuMWhu/i4Xk3CfcuhPvxsG0LI7BlA4="; + hash = "sha256-B3oYh0okbIeEvBjBHvY29QTqPyR2TTzLmz6fMsIRcs0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 46e937eb8dae5..02067d4ebaa95 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -1,33 +1,34 @@ { lib -, isPy3k , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, nose , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "annexremote"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; - rev = "v${version}"; - sha256 = "sha256-h03gkRAMmOq35zzAq/OuctJwPAbP0Idu4Lmeu0RycDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-eBq1nZnNuzTLvc11G/XaenZlVEUke3kpWlZ7P5g4kc8="; }; - nativeCheckInputs = [ - nose + nativeBuildInputs = [ + setuptools + setuptools-scm ]; - checkPhase = '' - nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "annexremote" @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper module to easily develop git-annex remotes"; homepage = "https://github.com/Lykos153/AnnexRemote"; + changelog = "https://github.com/Lykos153/AnnexRemote/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ montag451 ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 14fea5e4835a7..2e5ebe9e8e035 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.75"; + version = "9.2.76"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t8kxGwLEVVp1WMFA+yFLMAPJBT46m0ZFG2lhWMxoolw="; + hash = "sha256-g1qlcaSByXhF+6ffxwbV/0tXFdmLySH3TcDuok4y6xw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index b37e7d9a8a189..0a186781b4a22 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -28,6 +28,7 @@ , pyro-ppl #, pystan (not packaged) , numpyro +, bokeh }: buildPythonPackage rec { @@ -72,6 +73,7 @@ buildPythonPackage rec { pytestCheckHook torchvision zarr + bokeh ]; preCheck = '' @@ -97,6 +99,8 @@ buildPythonPackage rec { # An issue has been opened upstream: https://github.com/arviz-devs/arviz/issues/2282 "test_plot_ppc_discrete" "test_plot_ppc_discrete_save_animation" + # Assertion error + "test_data_zarr" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9049a22851854..feb778c729aaf 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.pythonForBuild.interpreter} ${src}/test.py + ${python.pythonOnBuildForHost.interpreter} ${src}/test.py ''; pythonImportsCheck = ["asyncinotify"]; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 165665b5a1b37..3b0cc0eb80308 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-kWlfckSjBxgzLd1ND4M0btt/+zfSHj5h4V/uDLmnHaA="; + hash = "sha256-KNhuonqFt+KrRYctQ426FcnzxISp5sBRs28hFL/Du0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 48218451a5ab1..b4e4774af8ce1 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , hatch-fancy-pypi-readme , hatchling , awkward-cpp @@ -23,14 +23,16 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.4.6"; + version = "2.4.10"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-MRnrPChX3a26JELh4oH5nefwoQurpvpprZXeNnz1Cwo="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "awkward"; + rev = "refs/tags/v${version}"; + hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw="; }; nativeBuildInputs = [ @@ -69,7 +71,6 @@ buildPythonPackage rec { # The following tests have been disabled because they need to be run on a GPU platform. disabledTestPaths = [ "tests-cuda" - "tests-cuda-kernels" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 65f5bcf36e94b..54ad818bb8a19 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-ZHEWG/A3lNwSw3MxguqjvgAOx5IHei43ku7GVJh8tLY="; + hash = "sha256-RjZWK7XfyRYu7vNaxPd0/F5nBN/JH01ZwZXloMS0g68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index e9ca9dba6ca73..1a4da01df6d43 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -69,6 +69,10 @@ buildPythonPackage rec { disabledTests = [ # exact comparison of floating points "test_optimize_l0_homotopy" + # AssertionError: 5 != 2 + "test_get_standard_plots_moo" + # AssertionError: Expected 'warning' to be called once. Called 3 times + "test_validate_kwarg_typing" ]; pythonImportsCheck = [ "ax" ]; diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index db43d7770d2bc..40726506f72b5 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -1,27 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, azure-core -, msrest +{ lib +, pythonOlder +, isodate +, fetchPypi +, buildPythonPackage +, azure-core }: buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; + hash = "sha256-cJIRe68GzY6T7ukhN+coF2m0AD/EFtSh7aZGuyVkAnw="; }; propagatedBuildInputs = [ azure-core - msrest + isodate ]; - pythonImportsCheck = [ "azure.appconfiguration" ]; + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "azure.appconfiguration" + ]; meta = with lib; { description = "Microsoft App Configuration Data Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1a4ef7c80cb66..b89653fb67811 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.14.2"; + version = "12.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mcMtgN2jX4hO4NSNk/1X9vT/vgCulYR5w7fV9OsCHrw="; + hash = "sha256-AJjxz6k0TE94HODNUE/zo1JVdRVTwB5yDczQyqjYqio="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index a23a79024a482..229f9282c3555 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -1,17 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pytestCheckHook , pythonOlder -, setuptools -, setuptools-scm -, wheel }: buildPythonPackage rec { pname = "backports-strenum"; - version = "1.2.4"; - format = "pyproject"; + version = "1.2.8"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +17,11 @@ buildPythonPackage rec { owner = "clbarnes"; repo = "backports.strenum"; rev = "refs/tags/v${version}"; - hash = "sha256-AhAMVawnBMJ45a3mpthUZvqTeqeCB1Uco4MSusLyA4E="; + hash = "sha256-jbMR9VAGsMAJTP2VQyRr+RPYwWwk8hGAYs4KoZEWa7U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel + poetry-core ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bandcamp-api/default.nix b/pkgs/development/python-modules/bandcamp-api/default.nix index 4546843dbc887..31efe43cbef59 100644 --- a/pkgs/development/python-modules/bandcamp-api/default.nix +++ b/pkgs/development/python-modules/bandcamp-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bandcamp-api"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; src = fetchPypi { pname = "bandcamp_api"; inherit version; - hash = "sha256-v/iACVcBFC/3x4v7Q/1p+aHGhfw3AQ43eU3sKz5BskI="; + hash = "sha256-7/WXMo7fCDMHATp4hEB8b7fNJWisUv06hbP+O878Phs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bash-kernel/bash-path.patch b/pkgs/development/python-modules/bash-kernel/bash-path.patch new file mode 100644 index 0000000000000..98c3cc511ab74 --- /dev/null +++ b/pkgs/development/python-modules/bash-kernel/bash-path.patch @@ -0,0 +1,22 @@ +diff --git a/bash_kernel/kernel.py b/bash_kernel/kernel.py +index 0496f1e..bd13c4f 100644 +--- a/bash_kernel/kernel.py ++++ b/bash_kernel/kernel.py +@@ -88,7 +88,7 @@ class BashKernel(Kernel): + @property + def banner(self): + if self._banner is None: +- self._banner = check_output(['bash', '--version']).decode('utf-8') ++ self._banner = check_output(['@bash@', '--version']).decode('utf-8') + return self._banner + + language_info = {'name': 'bash', +@@ -116,7 +116,7 @@ class BashKernel(Kernel): + # source code there for comments and context for + # understanding the code here. + bashrc = os.path.join(os.path.dirname(pexpect.__file__), 'bashrc.sh') +- child = pexpect.spawn("bash", ['--rcfile', bashrc], echo=False, ++ child = pexpect.spawn("@bash@", ['--rcfile', bashrc], echo=False, + encoding='utf-8', codec_errors='replace') + # Following comment stolen from upstream's REPLWrap: + # If the user runs 'env', the value of PS1 will be in the output. To avoid diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix new file mode 100644 index 0000000000000..1c50b151f01e6 --- /dev/null +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, flit-core +, ipykernel +, python +, pexpect +, bash +, substituteAll +}: + +buildPythonPackage rec { + pname = "bash-kernel"; + version = "0.9.1"; + pyproject = true; + + src = fetchPypi { + pname = "bash_kernel"; + inherit version; + hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; + }; + + patches = [ + (substituteAll { + src = ./bash-path.patch; + bash = lib.getExe bash; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + ipykernel + pexpect + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + ${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Bash Kernel for Jupyter"; + homepage = "https://github.com/takluyver/bash_kernel"; + changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix deleted file mode 100644 index 331b9c91707a2..0000000000000 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, flit-core -, ipykernel -, isPy27 -, python -, pexpect -, bash -}: - -buildPythonPackage rec { - pname = "bash_kernel"; - version = "0.9.1"; - format = "flit"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; - }; - - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff"; - sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j"; - }) - ]; - - postPatch = '' - substituteInPlace bash_kernel/kernel.py \ - --replace "'bash'" "'${bash}/bin/bash'" \ - --replace "\"bash\"" "'${bash}/bin/bash'" - ''; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ ipykernel pexpect ]; - - # no tests - doCheck = false; - - preBuild = '' - export HOME=$TMPDIR - ''; - - postInstall = '' - ${python.pythonForBuild.interpreter} -m bash_kernel.install --prefix $out - ''; - - meta = with lib; { - description = "Bash Kernel for Jupyter"; - homepage = "https://github.com/takluyver/bash_kernel"; - changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 7f97f5d933cb1..ed5cb1a6091ab 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' - ${python.pythonForBuild.interpreter} -c 'import bashlex' + ${python.pythonOnBuildForHost.interpreter} -c 'import bashlex' ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 8df2ee06a9913..faec6cb3650e6 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.13.0"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qvr4CYOMgyTEFONpe6KA176H56+w6RHThAyUthIzszE="; + hash = "sha256-eO17EuZ9K6tLAyEGmTaxw1Cxfz3XPPwNCcIwZ2/uHug="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix new file mode 100644 index 0000000000000..5cd247cf28724 --- /dev/null +++ b/pkgs/development/python-modules/bork/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +, build +, coloredlogs +, packaging +, toml +, twine +, wheel +}: + +buildPythonPackage rec { + pname = "bork"; + version = "7.0.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "duckinator"; + repo = pname; + rev = "v${version}"; + hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + }; + + propagatedBuildInputs = [ + build + coloredlogs + packaging + toml + twine + wheel + ]; + + pythonImportsCheck = [ + "bork" + "bork.api" + "bork.cli" + ]; + + meta = with lib; { + description = "Python build and release management tool"; + homepage = "https://github.com/duckinator/bork"; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index b74594f25ed9b..2b3af3e5702d7 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -6,24 +6,24 @@ , mkdocs-mermaid2-plugin , mkdocstrings , networkx -, pygraphviz , pytestCheckHook , pythonOlder , requests +, typing-extensions }: buildPythonPackage rec { pname = "canals"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "deepset-ai"; - repo = pname; + repo = "canals"; rev = "refs/tags/v${version}"; - hash = "sha256-XC4CxvDghz8/LReeYjHEVtd8j2ZN4jd+x7vP6N8BKpc="; + hash = "sha256-5pRrpi1qxkFgGqcw7Nfc5rnOTra27H31DLKCglkPf6s="; }; nativeBuildInputs = [ @@ -32,15 +32,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx + requests + typing-extensions ]; passthru.optional-dependencies = { - graphviz = [ - pygraphviz - ]; - mermaid = [ - requests - ]; docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -54,7 +50,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Test requires internet connection to mermaid.ink - "test/pipelines/integration" + "test/pipeline/integration" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 5d6c520ad3c16..e985ed544d3cd 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, cryptography , cython , eventlet , fetchFromGitHub @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.26.0"; + version = "3.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "datastax"; repo = "python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-mLQEG41WyFtXY2PJzoM4uaI4Cm+0xSIAPGhijHHbTBk="; + hash = "sha256-5JRbzYl7ftgK6GuvXWdvo52ZlS1th9JyLAYu/UCcPVc="; }; postPatch = '' @@ -56,17 +57,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - eventlet mock nose pytz pyyaml sure - scales - gremlinpython - gevent - twisted - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests @@ -77,6 +73,13 @@ buildPythonPackage rec { '') + '' # increase tolerance for time-based test substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + + export HOME=$(mktemp -d) + # cythonize this before we hide the source dir as it references + # one of its files + cythonize -i tests/unit/cython/types_testhelper.pyx + + mv cassandra .cassandra.hidden ''; pythonImportsCheck = [ @@ -105,6 +108,15 @@ buildPythonPackage rec { "test_nts_token_performance" ]; + passthru.optional-dependencies = { + cle = [ cryptography ]; + eventlet = [ eventlet ]; + gevent = [ gevent ]; + graph = [ gremlinpython ]; + metrics = [ scales ]; + twisted = [ twisted ]; + }; + meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 30e140a831428..840c01d876a1a 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { runHook preBuild # these arguments must set after bdist_wheel - ${python.pythonForBuild.interpreter} setup.py bdist_wheel --no-widget --prebuilt-extensions-build-root-dir=${lib.getDev catboost} + ${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel --no-widget --prebuilt-extensions-build-root-dir=${lib.getDev catboost} runHook postBuild ''; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 15fba8b6a6549..9c24281e8d62a 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.8"; + version = "2.2.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9g0UmG2MJN1GB4ny/BvMV0ipID4w9e5P+NJnpd6DqeI="; + hash = "sha256-Q6Ii2fsJYNABhuaRK4nZ6bjjvNsoIcgNVFBXdBgTXIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 5237fe31f3704..1d1b21ceee575 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.10.2"; + version = "0.11.0"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-jLaYdVNgjpy/fjjt9om72jirgMaM61T/OZu/iHZ/W4k="; + hash = "sha256-uRndA0NnSQtJTftALzBF3FWZtavRyMwBlnCBqoIXE5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8907b8b8ac26f..c185d1148bdb3 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.75"; + version = "9.2.76"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-ErPk93hDKV1QyGOjxYNaLzNuq6Od374G8qOxWiJwpuo="; + hash = "sha256-BwhM5J+20ZvP0d+9TAqy0AgRuPU6XoLKgM88WJdf3Qg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 3f4e7addb7780..efc5c6168195d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.75"; + version = "9.2.76"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-xiYkXC3/JPgXJ23ISl0LVrdm368hDPCG5NqQM6lDXf4="; + hash = "sha256-01Y4UKTkaO6bYtVTvv4KFzkEdj4qKiWKaC80/iKa/Eg="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-F2kgEffFWK7i1BgU5ulsNJitGcGcEziYRU+y86wKgXU="; + hash = "sha256-uMT9LvDkXl3SueR80pgGJRkWbymDRmGEn8HV93K/VNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index f1de682c40b53..fdaf384262b8e 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -6,23 +6,27 @@ , termcolor , tqdm , pandas +, setuptools # test dependencies +, pytestCheckHook +, pytest-lazy-fixture , tensorflow , torch , datasets , torchvision , keras , fasttext +, hypothesis +, wget +, matplotlib +, skorch }: -let + +buildPythonPackage rec { pname = "cleanlab"; version = "2.5.0"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cleanlab"; @@ -31,11 +35,7 @@ buildPythonPackage { hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; }; - # postPatch = '' - # substituteInPlace pyproject.toml \ - # --replace '"rich <= 13.0.1"' '"rich"' \ - # --replace '"numpy < 1.24.0"' '"numpy"' - # ''; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ scikit-learn @@ -44,13 +44,38 @@ buildPythonPackage { pandas ]; + # This is ONLY turned off when we have testing enabled. + # The reason we do this is because of duplicate packages in the enclosure + # when using the packages in nativeCheckInputs. + # Affected packages: grpcio protobuf tensorboard tensorboard-plugin-profile + catchConflicts = (!doCheck); + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + pytest-lazy-fixture tensorflow torch datasets torchvision keras fasttext + hypothesis + wget + matplotlib + skorch + ]; + + disabledTests = [ + # Requires the datasets we prevent from downloading + "test_create_imagelab" + ]; + + disabledTestPaths = [ + # Requires internet + "tests/test_dataset.py" + # Requires the datasets we just prevented from downloading + "tests/datalab/test_cleanvision_integration.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix index 7e2ed9b1bf5ac..18a97769b3d84 100644 --- a/pkgs/development/python-modules/click-aliases/default.nix +++ b/pkgs/development/python-modules/click-aliases/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-ZrNdxUMLRre0U9xCyyU8HjByNGMSXiuMDVjW9e88eyk="; + hash = "sha256-HTjo6ID27W7D4MZjeAJMSy5yVd6oKg0Ed9/kDtQZ7Vw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 967bcab909d43..91484fe6a7f75 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.9.29.14"; + version = "2023.10.30.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-88tNPg/0U5ZC2OvH8Bh9EzKzRFF2YClS2tyrswBaUZw="; + hash = "sha256-Kb6iVLV///X0UKby/7/wfbSGUFLw6HQX3SUwPX79QD0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 0a2b13ad4c811..f6135ecba7447 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; meta = with lib; { - homepage = "http://cvxopt.org/"; + homepage = "https://cvxopt.org/"; description = "Python Software for Convex Optimization"; longDescription = '' CVXOPT is a free software package for convex optimization based on the diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 0fb8be981e101..3d34b6edda8a2 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -12,19 +12,20 @@ , scs , setuptools , wheel +, pybind11 , useOpenmp ? (!stdenv.isDarwin) }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.3.2"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU="; + hash = "sha256-ep7zTjxX/4yETYbwo4NPtVda8ZIzlHY53guld8YSLj4="; }; # we need to patch out numpy version caps from upstream @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools wheel + pybind11 ]; propagatedBuildInputs = [ @@ -44,7 +46,6 @@ buildPythonPackage rec { osqp scipy scs - setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index b07ceca9a6dc0..9abc6abced01d 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.2.3"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-I94YsfDJ+FGQBRWCRKum917tXJ5vFm/cWbbM+NpwA4M="; + hash = "sha256-M3aR3lCNtPIve1o16QLSnxrULhtXkuOXNYtOv2FmPMQ="; }; nativeBuildInputs = [ @@ -78,9 +78,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # These tests require network access. + # These tests require network access "test_bom_v1_3_with_metadata_component" "test_bom_v1_4_with_metadata_component" + # AssertionError: <ValidationError: "{'algorithm': 'ES256', ... + "TestJson" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 4cdd8f31a5fd7..c2bdca1bfe69a 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pari - python.pythonForBuild.pkgs.pip + python.pythonOnBuildForHost.pkgs.pip ]; buildInputs = [ diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index f20b693d38707..0c768ba5dbe14 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , einops , emoji , flax @@ -16,16 +17,20 @@ buildPythonPackage rec { pname = "dalle-mini"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c="; }; - format = "setuptools"; - - buildInputs = [ - jaxlib + # Fix incompatibility with the latest JAX versions + # See https://github.com/borisdayma/dalle-mini/pull/338 + patches = [ + (fetchpatch { + url = "https://github.com/borisdayma/dalle-mini/pull/338/commits/22ffccf03f3e207731a481e3e42bdb564ceebb69.patch"; + hash = "sha256-LIOyfeq/oVYukG+1rfy5PjjsJcjADCjn18x/hVmLkPY="; + }) ]; propagatedBuildInputs = [ @@ -34,6 +39,7 @@ buildPythonPackage rec { flax ftfy jax + jaxlib pillow transformers unidecode diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 5d99a40c004b6..59e28a31daf41 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage -, celery -, dash-core-components +, pythonOlder +, fetchFromGitHub + +, nodejs +, yarn +, fixup_yarn_lock +, fetchYarnDeps + +, setuptools +, flask +, werkzeug +, plotly , dash-html-components +, dash-core-components , dash-table +, importlib-metadata +, typing-extensions +, requests +, retrying +, ansi2html +, nest-asyncio + +, celery +, redis , diskcache -, fetchFromGitHub -, flask -, flask-compress -, mock , multiprocess -, plotly , psutil -, pytest-mock +, flask-compress + , pytestCheckHook -, pythonOlder +, pytest-mock +, mock , pyyaml -, redis }: buildPythonPackage rec { pname = "dash"; - version = "2.13.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,16 +46,52 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+pTxEPuXtcu+ZekphqXD/k2tQ5werH/1ueGJOxA8pZw="; + hash = "sha256-vQOfX9RCIbr5lfUyT2knwrO374/vm7jH+/1+BeqmRjI="; }; + nativeBuildInputs = [ + nodejs + yarn + fixup_yarn_lock + ]; + + yarnDeps = fetchYarnDeps { + yarnLock = src + "/@plotly/dash-jupyterlab/yarn.lock"; + hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU="; + }; + + preBuild = '' + pushd @plotly/dash-jupyterlab + + export HOME=$(mktemp -d) + + yarn config --offline set yarn-offline-mirror ${yarnDeps} + fixup_yarn_lock yarn.lock + + substituteInPlace package.json --replace jlpm yarn + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts + patchShebangs . + + # Generates the jupyterlab extension files + yarn run build:pack + + popd + ''; + propagatedBuildInputs = [ - dash-core-components - dash-html-components - dash-table + setuptools # for importing pkg_resources flask - flask-compress + werkzeug plotly + dash-html-components + dash-core-components + dash-table + importlib-metadata + typing-extensions + requests + retrying + ansi2html + nest-asyncio ]; passthru.optional-dependencies = { @@ -52,35 +104,31 @@ buildPythonPackage rec { multiprocess psutil ]; + compress = [ + flask-compress + ]; }; nativeCheckInputs = [ - mock - pytest-mock pytestCheckHook + pytest-mock + mock pyyaml ]; disabledTestPaths = [ "tests/unit/test_browser.py" - "tests/unit/test_app_runners.py" # Use selenium + "tests/unit/test_app_runners.py" # Uses selenium "tests/integration" ]; - disabledTests = [ - # Failed: DID NOT RAISE <class 'ImportError'> - "test_missing_flask_compress_raises" - ]; - - pythonImportsCheck = [ - "dash" - ]; + pythonImportsCheck = [ "dash" ]; - meta = with lib; { + meta = { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; - changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ antoinerg ]; + changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ antoinerg tomasajt ]; }; } diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index bcc274b7771c3..39ae8e5ddcad7 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.10.1"; + version = "2023.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-ov5vE9O+dq0ByfSMluQl7NN0vZAcvvBX27iwoYSruSs="; + hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 706dd76a1da33..fcf2e03ad5962 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.10.0"; + version = "2023.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-u7KuZT0uH833zqLNBfqRLU7EcMrUmXgszevYA3Z7G1Y="; + hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI="; }; nativeBuildInputs = [ @@ -114,7 +114,7 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" substituteInPlace pyproject.toml \ - --replace ', "versioneer[toml]==0.28"' "" \ + --replace ', "versioneer[toml]==0.29"' "" \ --replace " --durations=10" "" \ --replace " --cov-config=pyproject.toml" "" \ --replace "\"-v" "\" " diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 4394271f7ebd2..c6d705337d742 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.12.0"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZeDQn+/b6WBCodZ7Ow5IlC9XlWieAifCMJtM1yse5P8="; + hash = "sha256-ay/NaJ/u/XG9XQ7C2dzmJKs/j1s/vDHUnaE/qDhho9Q="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 5e1053fc1af9f..f929f58de1c38 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; configureFlags = [ - "PYTHON=${python.pythonForBuild.interpreter}" + "PYTHON=${python.pythonOnBuildForHost.interpreter}" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index cae8c8abcc665..20d855bf0d262 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -5,17 +5,21 @@ , pythonOlder , aiofiles , aiohttp +, backports-datetime-fromisoformat +, click , click-log , emoji , glom , jinja2 , pyyaml +, freezegun +, setuptools }: buildPythonPackage rec { pname = "dinghy"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +27,18 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a1CHbPSoiR3JbuAXYPJc1EsSq13DbrOttk9zLFF9+cM="; + hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp + backports-datetime-fromisoformat + click click-log emoji glom @@ -37,6 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 14289caae4669..f75d326887389 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.31.0"; + version = "0.32.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitLab { domain = "gitlab.mpcdf.mpg.de"; owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo="; + hash = "sha256-D+Gt5RrzljZQHBijaPuCuNsK08VxxJoWhqxSDu4bjH0="; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index fa1718ea57ede..217782a34e6c6 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-D0GNigdphMArcpU6eI4roiiarIop3qW1tW2KIvJhlWU="; + hash = "sha256-kTp0CowXtnLXetcnoCeqlXoadgaQhL5mTYTfq9QLIl8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 9323255cc27c8..61c29fbff49ba 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -1,24 +1,34 @@ { lib , buildPythonPackage -, isPyPy -, isPy3k , cython , numpy -, pkgs +, libdynd +, fetchpatch +, cmake +, fetchFromGitHub }: buildPythonPackage rec { version = "0.7.2"; pname = "dynd"; - disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11 - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "libdynd"; repo = "dynd-python"; rev = "v${version}"; sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh"; }; + patches = [ + # Fix numpy compatibility + # https://github.com/libdynd/dynd-python/issues/746 + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/numpy-compatibility.patch?h=python-dynd&id=e626acabd041069861311f314ac3dbe9e6fd24b7"; + sha256 = "sha256-oA/3G8CGeDhiYXbNX+G6o3QSb7rkKItuCDCbnK3Rt10="; + name = "numpy-compatibility.patch"; + }) + ]; + # setup.py invokes git on build but we're fetching a tarball, so # can't retrieve git version. We hardcode: preConfigure = '' @@ -28,12 +38,22 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # Python 3 works but has a broken import test that I couldn't - # figure out. - doCheck = !isPy3k; - nativeBuildInputs = [ pkgs.cmake ]; - buildInputs = [ pkgs.libdynd.dev cython ]; - propagatedBuildInputs = [ numpy pkgs.libdynd ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cython + libdynd.dev + ]; + + propagatedBuildInputs = [ + libdynd + numpy + ]; + + # ModuleNotFoundError: No module named 'dynd.config' + doCheck = false; + + pythonImportsCheck = [ "dynd" ]; meta = with lib; { homepage = "http://libdynd.org"; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 61d802ba5c158..73d377e78b15e 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -65,5 +65,6 @@ buildPythonPackage rec { changelog = "https://github.com/tianocore/edk2-pytool-library/releases/tag/v${version}"; license = licenses.bsd2Patent; maintainers = with maintainers; [ nickcao ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 24abaebf7bb57..354f7b01af4e8 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-mUwckBelFVRCXp3hspB8WRFFaLVyRsfp6XbqU8HeHvw="; + hash = "sha256-8UuJA96pkXXRKDzQTjoz7w8TQrS5+nfLdsT0j9/oqz0="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index a1e0b65aec203..9cc5de24e0a55 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "einops"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+TaxaxOc5jAm79tIK0NHZ58HgcgdCANrSo/602YaF8E="; + hash = "sha256-wCs3rMnYCk07kJ3iPItxwCQATflKBYHk6tfBCjiF+bc="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 4e861365eab72..78dfe237e100a 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.4"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-IXI1Aot0M6VKyiiuyjR+P0WufZO4MMDemC48/kMhvTY="; + hash = "sha256-0qVbHZ8ADyZDb4wLqEb7zgl3MHZz+8DSLGCMGlt0+eE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index 92d8a5e78560f..35275c32780a1 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # Native build inputs , cython @@ -27,12 +28,12 @@ , hypothesis , pytestCheckHook }: -let + +buildPythonPackage rec { pname = "fairseq"; version = "0.12.3"; -in -buildPythonPackage rec { - inherit version pname; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytorch"; @@ -41,17 +42,25 @@ buildPythonPackage rec { hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc="; }; - disabled = pythonOlder "3.7"; + patches = [ + # https://github.com/facebookresearch/fairseq/pull/5359 + (fetchpatch { + url = "https://github.com/facebookresearch/fairseq/commit/2fa0768c2115b0a4c207cfa3e1b3e4ff3ad9a00c.patch"; + hash = "sha256-aYYP/knQX6q6vhyA6q9uOOYfRhDAuJCo9QJWfFEDuuA="; + }) + ]; nativeBuildInputs = [ cython pythonRelaxDepsHook which ]; + pythonRelaxDeps = [ "hydra-core" "omegaconf" ]; + propagatedBuildInputs = [ cffi hydra-core @@ -74,6 +83,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "fairseq" ]; + preCheck = '' export HOME=$TMPDIR cd tests @@ -82,6 +92,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--import-mode append" ]; + disabledTests = [ # this test requires xformers "test_xformers_single_forward_parity" @@ -96,6 +107,11 @@ buildPythonPackage rec { "test_librispeech_s2t_conformer_s_checkpoint" ]; + disabledTestPaths = [ + # ValueError: mutable default ... for field bar is not allowed: use default_factory + "test_dataclass_utils.py" + ]; + meta = with lib; { description = "Facebook AI Research Sequence-to-Sequence Toolkit"; homepage = "https://github.com/pytorch/fairseq"; diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix new file mode 100644 index 0000000000000..afee9c60f8945 --- /dev/null +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -0,0 +1,290 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, hatchling +, boilerpy3 +, events +, httpx +, jsonschema +, lazy-imports +, more-itertools +, networkx +, pandas +, pillow +, platformdirs +, posthog +, prompthub-py +, pydantic +, quantulum3 +, rank-bm25 +, requests +, requests-cache +, scikit-learn +, sseclient-py +, tenacity +, tiktoken +, tqdm +, transformers +, openai-whisper +, boto3 +, botocore +# , beir +, selenium +, coverage +, dulwich +# , jupytercontrib +, mkdocs +, mypy +, pre-commit +, psutil +# , pydoc-markdown +, pylint +, pytest +, pytest-asyncio +, pytest-cov +# , pytest-custom-exit-code +, python-multipart +, reno +, responses +, toml +, tox +, watchdog +, elastic-transport +, elasticsearch +# , azure-ai-formrecognizer +, beautifulsoup4 +, markdown +, python-docx +, python-frontmatter +, python-magic +, tika +, black +, huggingface-hub +, sentence-transformers +, mlflow +, rapidfuzz +, scipy +, seqeval +, pdf2image +, pytesseract +, faiss +# , faiss-gpu +, pinecone-client +, onnxruntime +, onnxruntime-tools +# , onnxruntime-gpu +, opensearch-py +, pymupdf +, langdetect +, nltk +, canals +, jinja2 +, openai +, aiorwlock +, ray +, psycopg2 +, sqlalchemy +, sqlalchemy-utils +, weaviate-client +}: + +buildPythonPackage rec { + pname = "farm-haystack"; + version = "1.22.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deepset-ai"; + repo = "haystack"; + rev = "refs/tags/v${version}"; + hash = "sha256-0tRgZqySM9vPhs5lar89Gz/G7/YgRuFZosgTdKuGBH0="; + }; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # We call it faiss, not faiss-cpu. + "faiss-cpu" + ]; + + propagatedBuildInputs = [ + boilerpy3 + events + httpx + jsonschema + lazy-imports + more-itertools + networkx + pandas + pillow + platformdirs + posthog + prompthub-py + pydantic + quantulum3 + rank-bm25 + requests + requests-cache + scikit-learn + sseclient-py + tenacity + tiktoken + tqdm + transformers + ]; + + env.HOME = "$(mktemp -d)"; + + passthru.optional-dependencies = { + # all = [ + # farm-haystack + # ]; + # all-gpu = [ + # farm-haystack + # ]; + audio = [ + openai-whisper + ]; + aws = [ + boto3 + botocore + ]; + # beir = [ + # beir + # ]; + colab = [ + pillow + ]; + crawler = [ + selenium + ]; + dev = [ + coverage + dulwich + # jupytercontrib + mkdocs + mypy + pre-commit + psutil + # pydoc-markdown + pylint + pytest + pytest-asyncio + pytest-cov + # pytest-custom-exit-code + python-multipart + reno + responses + toml + tox + watchdog + ]; + elasticsearch7 = [ + elastic-transport + elasticsearch + ]; + elasticsearch8 = [ + elastic-transport + elasticsearch + ]; + file-conversion = [ + # azure-ai-formrecognizer + beautifulsoup4 + markdown + python-docx + python-frontmatter + python-magic + # python-magic-bin + tika + ]; + formatting = [ + black + ]; + inference = [ + huggingface-hub + sentence-transformers + transformers + ]; + metrics = [ + mlflow + rapidfuzz + scipy + seqeval + ]; + ocr = [ + pdf2image + pytesseract + ]; + only-faiss = [ + faiss + ]; + # only-faiss-gpu = [ + # faiss-gpu + # ]; + only-pinecone = [ + pinecone-client + ]; + onnx = [ + onnxruntime + onnxruntime-tools + ]; + # onnx-gpu = [ + # onnxruntime-gpu + # onnxruntime-tools + # ]; + opensearch = [ + opensearch-py + ]; + pdf = [ + pymupdf + ]; + preprocessing = [ + langdetect + nltk + ]; + preview = [ + canals + jinja2 + lazy-imports + openai + pandas + rank-bm25 + requests + tenacity + tqdm + ]; + ray = [ + aiorwlock + ray + ]; + sql = [ + psycopg2 + sqlalchemy + sqlalchemy-utils + ]; + weaviate = [ + weaviate-client + ]; + }; + + # the setup for test is intensive, hopefully can be done at some point + doCheck = false; + + + pythonImportsCheck = [ "haystack" ]; + + meta = with lib; { + description = "LLM orchestration framework to build customizable, production-ready LLM applications"; + longDescription = '' + LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots + ''; + changelog = "https://github.com/deepset-ai/haystack/releases/tag/${src.rev}"; + homepage = "https://github.com/deepset-ai/haystack"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 0a6b086fe516e..fa0f053f86de1 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,53 +1,66 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , jaxlib +, pythonRelaxDepsHook +, setuptools-scm , jax -, keras -, lib -, matplotlib , msgpack , numpy , optax +, pyyaml +, rich +, tensorstore +, typing-extensions +, matplotlib +, cloudpickle +, einops +, keras , pytest-xdist , pytestCheckHook -, pythonRelaxDepsHook , tensorflow -, tensorstore -, fetchpatch -, rich }: buildPythonPackage rec { pname = "flax"; - version = "0.7.4"; + version = "0.7.5"; + pyproject = true; src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-i48omag/1Si3mCCGfsUD9qeejyeCLWzvvwKJqH8vm8k="; + hash = "sha256-NDah0ayQbiO1/sTU1DDf/crPq5oLTnSuosV7cFHlTM8="; }; - nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ]; + nativeBuildInputs = [ + jaxlib + pythonRelaxDepsHook + setuptools-scm + ]; propagatedBuildInputs = [ jax - matplotlib msgpack numpy optax + pyyaml rich tensorstore + typing-extensions ]; - # See https://github.com/google/flax/pull/2882. - pythonRemoveDeps = [ "orbax" ]; + passthru.optional-dependencies = { + all = [ matplotlib ]; + }; pythonImportsCheck = [ "flax" ]; nativeCheckInputs = [ + cloudpickle + einops keras pytest-xdist pytestCheckHook @@ -78,22 +91,6 @@ buildPythonPackage rec { "tests/checkpoints_test.py" ]; - disabledTests = [ - # See https://github.com/google/flax/issues/2554. - "test_async_save_checkpoints" - "test_jax_array0" - "test_jax_array1" - "test_keep0" - "test_keep1" - "test_optimized_lstm_cell_matches_regular" - "test_overwrite_checkpoints" - "test_save_restore_checkpoints_target_empty" - "test_save_restore_checkpoints_target_none" - "test_save_restore_checkpoints_target_singular" - "test_save_restore_checkpoints_w_float_steps" - "test_save_restore_checkpoints" - ]; - meta = with lib; { description = "Neural network library for JAX"; homepage = "https://github.com/google/flax"; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 09c2137872d29..8b29b61fe6984 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; + hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index 1323f2902cfc9..1b7dd1fc2ef05 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "formencode"; - version = "2.0.1"; + version = "2.1.0"; disabled = isPy27; src = fetchPypi { pname = "FormEncode"; inherit version; - sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035"; + sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index c29d6d4bec097..53e1544ed018e 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,71 +1,78 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , packaging +, setuptools , setuptools-scm , shapely , sqlalchemy , alembic -, psycopg2 , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.1"; - format = "setuptools"; + version = "0.14.2"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "GeoAlchemy2"; - inherit version; - hash = "sha256-Ygsxy/l6NoskhtvPzTbaIIGCfpM9QWO8uUIEO3m1Reg="; + src = fetchFromGitHub { + owner = "geoalchemy"; + repo = "geoalchemy2"; + rev = "refs/tags/${version}"; + hash = "sha256-C/F1hpL2DnzC4UPAGGFntlQlULCx5Ufzkw7EIrzRV7I="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ - packaging - shapely sqlalchemy + packaging ]; nativeCheckInputs = [ alembic - psycopg2 pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.shapely; - pytestFlagsArray = [ - # tests require live postgis database - "--deselect=tests/test_pickle.py::TestPickle::test_pickle_unpickle" - "--deselect=tests/gallery/test_specific_compilation.py::test_specific_compilation" - ]; + env = { + SETUPTOOLS_SCM_PRETEND_VERSION = version; + }; disabledTestPaths = [ - # tests require live postgis database + # tests require live databases "tests/gallery/test_decipher_raster.py" "tests/gallery/test_length_at_insert.py" + "tests/gallery/test_insert_raster.py" + "tests/gallery/test_orm_mapped_v2.py" + "tests/gallery/test_specific_compilation.py" "tests/gallery/test_summarystatsagg.py" "tests/gallery/test_type_decorator.py" "tests/test_functional.py" "tests/test_functional_postgresql.py" + "tests/test_functional_mysql.py" "tests/test_alembic_migrations.py" + "tests/test_pickle.py" ]; pythonImportsCheck = [ "geoalchemy2" ]; + passthru.optional-dependencies = { + shapely = [ shapely ]; + }; + meta = with lib; { description = "Toolkit for working with spatial databases"; - homepage = "https://geoalchemy-2.readthedocs.io/"; + homepage = "https://geoalchemy-2.readthedocs.io/"; changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 4e4f964c74304..47289fff59667 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.29.0"; + version = "3.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-s5o7vp7D/b73QQyIebrFT2zlhpJKYQDDXpgmDgN0+Nk="; + hash = "sha256-MJW0B3AXDYSVgNkv8iBA2+pOKrlI7pZeJfunMMxABx8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 2ee87fac60c2c..c955aafda5017 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.32.0"; + version = "2.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aU+42neWNlPhxw+mCSi0oR+vjh8VgKOQJQU6PhvM5t4="; + hash = "sha256-dpJmSe7NjmmDqd0GrLxm1e/VFvo64+ECNRVwuRpjrmI="; }; propagatedBuildInputs = [ @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Container Engine API client library"; - homepage = "https://github.com/googleapis/python-container"; - changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v${version}/packages/google-cloud-container/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index ddf8472ea7953..4fe3dddd3001a 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.3"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c4gPKov6YASVdvuU2FaYqiNn0yrJAbdieP5Qt1ZjRAs="; + hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { disabledTests = [ # Test requires credentials "test_inspect_content" + "test_list_dlp_jobs" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index ec554d61d32cb..0f9b9eca022f8 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.34.1"; + version = "0.34.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; + hash = "sha256-/GG9jPBw6Hqstidi6ypa8VUHBsmIgdeurrru0RKAr9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index fee868f6f0cee..45c2570881837 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QKI6rrgJeC93AGL8JTWZMqbj4P/2WPs+LP0VunrQnlk="; + hash = "sha256-vRTS65rjWNIQWM4JHBPeoRkX4m8cQ3OKUenOqLSbTzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 8298b6a07ba77..e7c930e77f070 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.3"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8yBC/+jxKsyQ5pz+VBSgnwqB/XxXCChpjGLAjMDoQow="; + hash = "sha256-KsXsWGEUwD0UFRD7V4rfqEuRjyWeU/PmPdh8X6djhG0="; }; propagatedBuildInputs = [ @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Security Command Center API API client library"; - homepage = "https://github.com/googleapis/python-securitycenter"; - changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securitycenter"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v${version}/packages/google-cloud-securitycenter/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 285a552ac9338..f71690c877e22 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.11.3"; + version = "5.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-O6uhT8zfCGiGr0v8pEMZ4uLuDAdFpiTie7EC3rphZQI="; + hash = "sha256-v6kpje5rw3/OfcoMWdSCZdkmETyIJ08cly8lLUt9j64="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 2f9ced5aec75f..abc5d52ece6d5 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { mesonFlags = [ "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" # Exec format error during configure - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; doCheck = true; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 1e914096f7d58..cfb79f88b72ae 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.0.2"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-qDURFcDm7zvDEv1Z+aoXtFfbilul6q6KlkjBvhkeYkM="; + hash = "sha256-sMvHvHwLuMT0LaH2XFDePuePbwCXjvl66QGdERR0k6g="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 24224b769d7a5..164a9b869e820 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.35"; + version = "0.36"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-FrAqVLyEtjhpiu1XdFY5yOstKKjXhRTv9PeaFlJaf8k="; + hash = "sha256-pYlirojeHi10kUcjcvpfBYpIzbYmIlFgOLfy7WRhACU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index f2008520e1f35..47f30ce2fc208 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.17.1"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yjDGYVCLIunowRnbw+Sl2FGYe0PDBWXbGAspHY/XcKQ="; + hash = "sha256-urcpYat6GHlNsmk1HZBVI/Kq3K1ZOzIVEpJ86T3J35E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index a0833b20798e8..c5cd3d2e4f3c8 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.3"; + version = "1.10.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-77RrqmoCftPc48fFtuuFo0KqGX3n+6aDx2RFkwGCNzQ="; + hash = "sha256-7gkesxQI6QBxyQpHlSSh1w6MDeid0dSdXn+jnxvafD0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix new file mode 100644 index 0000000000000..ae13f6585a1d5 --- /dev/null +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, beautifulsoup4 +, html5lib +, requests +, fusepy +}: + +buildPythonPackage rec { + pname = "htmllistparse"; + version = "0.6.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bcimvwPIQ7nTJYQ6JqI1GnlbVzzZKiybgnFiEBnGQII="; + }; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ beautifulsoup4 html5lib requests fusepy ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "htmllistparse" + ]; + + meta = with lib; { + homepage = "https://github.com/gumblex/htmllisting-parser"; + description = "Python parser for Apache/nginx-style HTML directory listing"; + license = licenses.mit; + maintainers = with maintainers; [ hexchen ]; + }; +} diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index e06b86f918021..6d5c4a66239cc 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -69,9 +69,6 @@ buildPythonPackage rec { doCheck = false; # Upstream has no tests meta = with lib; { - # Both protobuf3 and protobuf4 in the build closure. - # related: https://github.com/onnx/onnx/issues/5563 - broken = true; description = "State-of-the-art 2D and 3D Face Analysis Project"; homepage = "https://github.com/deepinsight/insightface"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix new file mode 100644 index 0000000000000..2d98144e90a8d --- /dev/null +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, urllib3 +, six +, certifi +, python-dateutil +, asn1crypto +}: + +buildPythonPackage rec { + pname = "ionoscloud"; + version = "6.1.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash= "sha256-QQNDqKZ+X+w5vHFXr793QqRjShNBZ182DyD3fUUxqkc="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ urllib3 six certifi python-dateutil asn1crypto ]; + + # upstream only has codecoverage tests, but no actual tests to go with them + doCheck = false; + + pythonImportsCheck = [ + "ionoscloud" + ]; + + meta = with lib; { + homepage = "https://github.com/ionos-cloud/sdk-python"; + description = "Python API client for ionoscloud"; + changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ hexchen ]; + }; +} diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 82ef5a953d8f4..f1cda9c58eae0 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -267,7 +267,7 @@ let x86_64-linux = "sha256-Hw4uFvltH7nlNN3qAEcQ+IR2FAOjRkvwyWA3rCPi7Vo="; } else { x86_64-linux = "sha256-LEugnFwTV3EyeTZWgMvXzHbgeDPdmuT3daXCXJRMYVY="; - aarch64-linux = "sha256-0AYF5AeuPHTlwtpDMs2+tAhRAJH0yeSVnB7Ni7wmzS8="; + aarch64-linux = "sha256-59rv/3RjD8pnveBDZ33xZoNQxLmnhMocsKMgVfYoO70="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 50c8c520fb082..39bc43bc41946 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.5"; + version = "1.23.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lIIUJL9NOtDpPQeuFi9xvFG0fPzYYEBv40s7Q+JSmN8="; + hash = "sha256-vAPWMv5vYFl45ZTl+p4HHAXeZ/10VSvubKINoyGPRq4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index 29a8bb0245845..7a2501f317b7d 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "jupyter-cache"; - version = "0.6.1"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-Jvg5ARQ+30ry8/9akeLSrSmORuLO4DyAcdN6I6Y8y/w="; + inherit version; + pname = "jupyter_cache"; + hash = "sha256-0Pp9dTPNV5gZjYiJMYJpqME4LtOyL2IsCak1ZSH0hoc="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A defined interface for working with a cache of jupyter notebooks"; homepage = "https://github.com/executablebooks/jupyter-cache"; + changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 2d7234051d235..014b67cb4b46c 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -11,6 +11,8 @@ , traitlets , isPyPy , py +, pythonOlder +, importlib-metadata }: buildPythonPackage rec { @@ -35,6 +37,8 @@ buildPythonPackage rec { pyzmq tornado traitlets + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix deleted file mode 100644 index 15b53f523b573..0000000000000 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }: -buildPythonPackage rec { - pname = "jupyterlab_launcher"; - version = "0.13.1"; - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0"; - }; - - propagatedBuildInputs = [ - jsonschema - notebook - ]; - - # depends on requests and a bunch of other libraries - doCheck = false; - - meta = with lib; { - description = "This package is used to launch an application built using JupyterLab"; - license = with licenses; [ bsd3 ]; - homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/python-modules/python-jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix index 7e21b4f45a214..7e21b4f45a214 100644 --- a/pkgs/development/python-modules/python-jwt/default.nix +++ b/pkgs/development/python-modules/jwt/default.nix diff --git a/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch b/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch deleted file mode 100644 index d3e3082b352d6..0000000000000 --- a/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001 -From: Rouven Czerwinski <r.czerwinski@pengutronix.de> -Date: Wed, 17 Feb 2021 14:03:20 +0100 -Subject: [PATCH] serialdriver: remove pyserial version check - -This check isn't required on NixOS, since pyserial within NixOS already -contains the patches. - -Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> ---- - labgrid/driver/serialdriver.py | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py -index 126f674e..59a92269 100644 ---- a/labgrid/driver/serialdriver.py -+++ b/labgrid/driver/serialdriver.py -@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol): - bindings = {"port": "SerialPort", } - else: - bindings = {"port": {"SerialPort", "NetworkSerialPort"}, } -- if version.parse(serial.__version__) != version.Version('3.4.0.1'): -- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n" -- "You can install the labgrid fork via:\n" -- "pip uninstall pyserial\n" -- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long -- warnings.warn(message) - - txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float)) - timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float)) --- -2.30.0 - diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 0e96bf2fe9ae2..aa4b10d49d5f7 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -17,7 +17,9 @@ , pyusb , pyyaml , requests +, setuptools , setuptools-scm +, wheel , xmodem }: @@ -32,13 +34,13 @@ buildPythonPackage rec { sha256 = "sha256-yhlBqqCLOt6liw4iv8itG6E4QfIa7cW76QJqefUM5dw="; }; - patches = [ - # Pyserial within Nixpkgs already includes the necessary fix, remove the - # pyserial version check from labgrid. - ./0001-serialdriver-remove-pyserial-version-check.patch + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; - nativeBuildInputs = [ setuptools-scm ]; + pyproject = true; propagatedBuildInputs = [ ansicolors diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index e14f008d0cb79..c2fabc40c03a1 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -42,7 +42,6 @@ , librosa , lxml , manifest-ml -, markdownify , neo4j , networkx , nlpcloud @@ -76,8 +75,8 @@ , pytest-asyncio , pytest-mock , pytest-socket -, pytest-vcr , pytestCheckHook +, requests-mock , responses , syrupy , toml @@ -85,7 +84,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.325"; + version = "0.0.334"; pyproject = true; disabled = pythonOlder "3.8"; @@ -94,7 +93,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-/bk4RafDDL4nozyFOiikyU4auBSftej21m5/FnEtDog="; + hash = "sha256-mXPqc8wF9DhEtITm8h5R9kHBcMJ7AEK4kL5Z7V2p8NE="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -253,21 +252,22 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - markdownify + lark pandas pytest-asyncio pytest-mock pytest-socket - pytest-vcr pytestCheckHook + requests-mock responses syrupy toml - ] ++ passthru.optional-dependencies.all; + ]; pytestFlagsArray = [ # integration_tests have many network, db access and require `OPENAI_API_KEY`, etc. "tests/unit_tests" + "--only-core" ]; disabledTests = [ @@ -279,6 +279,10 @@ buildPythonPackage rec { "test_socket_disabled" ]; + pythonImportsCheck = [ + "langchain" + ]; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/hwchase17/langchain"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index bf3230c910bdc..3b81c6128887f 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.53"; + version = "0.0.63"; 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-5w6bCNYoZAIrFkruw7E3Tw0G0no05x/g2hHESC3T2lw="; + hash = "sha256-KE+WMnuWAq1stZuuwZkOPOKQ2lZNKtxzNbZMRoOdmz0="; }; sourceRoot = "${src.name}/python"; @@ -60,6 +60,8 @@ buildPythonPackage rec { "langsmith" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index b10ad25972b5b..bc369705e2655 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,13 +1,54 @@ -{ buildPythonPackage, fetchPypi, lazr_delegates }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, lazr-delegates +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "lazr.config"; - version = "2.2.3"; - - propagatedBuildInputs = [ lazr_delegates ]; + pname = "lazr-config"; + version = "3.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; + pname = "lazr.config"; + inherit version; + hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lazr-delegates + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.config" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # change the directory to avoid a namespace-related problem + # ModuleNotFoundError: No module named 'lazr.delegates' + preCheck = '' + cd $out + ''; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Create configuration schemas, and process and validate configurations"; + homepage = "https://launchpad.net/lazr.config"; + changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 40e2e47d517dc..e0b03e6931943 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -1,15 +1,46 @@ -{ buildPythonPackage, fetchPypi, nose, zope_interface }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "lazr.delegates"; - version = "2.0.4"; + pname = "lazr-delegates"; + version = "2.1.0"; + pyproject = true; - propagatedBuildInputs = [ nose zope_interface ]; + src = fetchPypi { + pname = "lazr.delegates"; + inherit version; + hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw="; + }; - doCheck = false; # cannot import name 'ClassType' from 'types' + nativeBuildInputs = [ + setuptools + ]; - src = fetchPypi { - inherit pname version; - sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + propagatedBuildInputs = [ + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.delegates" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Easily write objects that delegate behavior"; + homepage = "https://launchpad.net/lazr.delegates"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index abc87f9d787cc..3e5d6af48afaf 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.7.0"; + version = "9.9.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-DFZPZx+jkxdNha+h50IXxl6wOwA1VjudRICgxD2V4+k="; + hash = "sha256-cajKzRRhKCUKWm+1p3xvCyEbVB2R/70WY584o7V+XaY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index d929b5e214bf9..10decb4f3f523 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -1,19 +1,19 @@ { lib , buildPythonPackage , fetchPypi -, cython +, cython_3 , isPyPy , ipython -, python , scikit-build , cmake , pythonOlder , pytestCheckHook +, ubelt }: buildPythonPackage rec { pname = "line-profiler"; - version = "4.0.2"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -21,22 +21,23 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw="; + hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI="; }; nativeBuildInputs = [ - cython + cython_3 cmake scikit-build ]; - propagatedBuildInputs = [ - ipython - ]; + passthru.optional-dependencies = { + ipython = [ ipython ]; + }; nativeCheckInputs = [ pytestCheckHook - ]; + ubelt + ] ++ passthru.optional-dependencies.ipython; dontUseCmakeConfigure = true; @@ -44,8 +45,9 @@ buildPythonPackage rec { rm -f _line_profiler.c ''; - checkPhase = '' - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s . + preCheck = '' + rm -r line_profiler + export PATH=$out/bin:$PATH ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index fd45045076806..85c6d0fb50fd5 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_cython + ${python.pythonOnBuildForHost.interpreter} setup.py build_cython ''; # On Darwin, the test requires macFUSE to be installed outside of Nix. diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 1f702894258bf..ee84d47edf552 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.1"; + version = "1.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-xCC0AEiHrulxNdBf59ap9oKh/mF1u9IzZsPYFJeHNR0="; + hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index b3c82f707f0dd..d2481a5bada95 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g2EEyPhsQZ+VKP/kSjZdQ9ns0NlptH8l2h0vTTLpF54="; + hash = "sha256-mij5WGIl60D7ya1SdIvZ8TEgIZhJ9Xd2kcUnnbO1dD4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 8fa3393d1e93e..03d4c5c05d879 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "maison"; - version = "1.4.0"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbatten5"; - repo = pname; + repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-Ny/n1vDWS6eA9zLIB0os5zrbwvutb+7sQ6iPXeid1M0="; + hash = "sha256-uJW+7+cIt+jnbiC+HvT7KzyNk1enEtELTxtfc4eXAPU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index 4d23928da1aca..cec9773449c5c 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 = "1.0"; + version = "1.3"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-cnEbws2NDxVkLEgLsYw2VQQWP69nC1SVixl9a6vHPmo="; + hash = "sha256-psgUg55NiyONo3ob4UIMrO793UrxGMZV73hj4HRCR8E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 4219e9a59431d..9fec1f0aa2431 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M7Wd4s9q+oNioi4JlcQcKSyLRliGgoMzkiXcIznpR5o="; + hash = "sha256-EBSbvjQyQIXOzvQMbuTwOoV8xSAOYDlCBZ56NLneuQI="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index bdc0a74007d81..dc786ac6d7d68 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -9,6 +9,7 @@ , pygments , pyqt5 , pythonOlder +, pythonAtLeast , traitsui , vtk , wrapQtAppsHook @@ -18,8 +19,7 @@ buildPythonPackage rec { pname = "mayavi"; version = "4.8.1"; format = "setuptools"; - - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 3060c2f4607c2..0f89f3f42525a 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -2,25 +2,56 @@ , buildPythonPackage , fetchPypi , html5lib +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mechanize"; - version = "0.4.8"; + version = "0.4.9"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; + hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; - propagatedBuildInputs = [ html5lib ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + html5lib + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; - doCheck = false; + pythonImportsCheck = [ + "mechanize" + ]; + + disabledTestPaths = [ + # Tests require network access + "test/test_urllib2_localnet.py" + "test/test_functional.py" + ]; + + disabledTests = [ + # Tests require network access + "test_pickling" + "test_password_manager" + ]; meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; - license = "BSD-style"; + changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 6ade4b8ecb2ec..2b2a7c9fcabb2 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -7,7 +7,6 @@ , nose , pandas , pytestCheckHook -, pythonRelaxDepsHook , pyyaml , scikit-learn , tensorflow @@ -16,23 +15,16 @@ buildPythonPackage rec { pname = "mhcflurry"; - version = "2.0.6"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openvax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Cr7L6uo6Kc1PSeG5nK6zQSD7eeCFcUJUzhsX+waz7og="; + hash = "sha256-VyPHcNlZYgNJZb2UBFX55x+nE0GnHixkcsiTNjDCju0="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRemoveDeps = [ - # See https://github.com/openvax/mhcflurry/issues/216. - "np-utils" - ]; - # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. propagatedBuildInputs = [ appdirs @@ -75,10 +67,6 @@ buildPythonPackage rec { "test_run_serial" "test_speed_allele_specific" "test_speed_pan_allele" - - # See https://github.com/openvax/mhcflurry/issues/217 - "test_more" - "test_small" ]; disabledTestPaths = [ 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 f28fbf5ff7b6c..0bd3f97175ce8 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.5"; + version = "0.6.6"; 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-08/nwJC7p5pwSXJicoJbZ8Xsc3yOvxWxzaCIS6aQ9uI="; + hash = "sha256-NEFogrLJjOh98rChlJuxAeTj31yyL4OoE/jBUcHbBZM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multi-key-dict/default.nix b/pkgs/development/python-modules/multi-key-dict/default.nix new file mode 100644 index 0000000000000..c959f2e8f2eca --- /dev/null +++ b/pkgs/development/python-modules/multi-key-dict/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "multi-key-dict"; + version = "2.0.3"; + pyproject = true; + + src = fetchPypi { + pname = "multi_key_dict"; + inherit version; + hash = "sha256-3uvewXqjChxDLLP0N+gfhiHhwFQqDAYXp09x4jLpk54="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "multi_key_dict" + ]; + + meta = with lib; { + description = "multi_key_dict"; + homepage = "https://github.com/formiaczek/multi_key_dict"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix deleted file mode 100644 index cb539e4dd90f6..0000000000000 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "multi_key_dict"; - version = "2.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; - }; - - meta = with lib; { - description = "multi_key_dict"; - homepage = "https://github.com/formiaczek/multi_key_dict"; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 5843cd9432b59..236af1eb5d1ff 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; postInstall = '' - ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc + ${python.pythonOnBuildForHost.interpreter} setup.py build_sphinx --build-dir=$doc ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index d23116c5b341f..c252f8cc294e8 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/gpodder/mygpoclient"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 37564eeb21373..f3c06701eb65c 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.19.0"; + version = "7.19.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-Wczk1DNoOpvd7efnZFUf4FSjYqHdkMKMNwNVeQOPeEg="; + hash = "sha256-Gz6OJ2ER60R14aTmhPfodX22FlbicUClBtlqNglTjC4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 33c06fc24619b..cf3d309420eb7 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , flit-core , importlib-metadata , ipython @@ -15,46 +14,23 @@ , sphinx-togglebutton , typing-extensions , ipykernel -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "myst-nb"; - version = "0.17.2"; + version = "1.0.0"; + pyproject = true; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; + inherit version; + pname = "myst_nb"; + hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; }; - patches = [ - # Fix compatiblity with myst-parser 1.0. Remove with the next release. - (fetchpatch { - url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; - hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; - excludes = [ - "myst_nb/__init__.py" - "docs/authoring/custom-formats.Rmd" - "docs/authoring/jupyter-notebooks.md" - "docs/index.md" - "pyproject.toml" - "tests/nb_fixtures/reporter_warnings.txt" - ]; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "myst-parser~=0.18.0" "myst-parser" - ''; - nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -71,10 +47,6 @@ buildPythonPackage rec { ipykernel ]; - pythonRelaxDeps = [ - "myst-parser" - ]; - pythonImportsCheck = [ "myst_nb" "myst_nb.sphinx_ext" diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 5bd9269503ef8..47ed44420f03d 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.4.0"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-AuGLP/7Mggk7rF9KRvqbVtAkQFq0NXaHDUGV6HMLU7Y="; + hash = "sha256-7TGP3J4qepnUV/3aC7FssSGu4PahB70DGWezjOy+/+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index d3d3a7add2c7b..1612bfac0d96f 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , dacite , fetchFromGitHub -, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,14 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K8EiDb6B18No9RNbw2a7U+FJQaXrrcFf0hgt40r6Igo="; + hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; propagatedBuildInputs = [ aiohttp aqipy-atmotech dacite - orjson ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index bec644ecaae1f..b122c7bbbf5e4 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.4.1"; - format = "pyproject"; + version = "2.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "yozik04"; - repo = pname; + repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-6WXn8W7C6QCy9afGMTL2NaSYuxQy+u2OYYa0Vc8sbV8="; + hash = "sha256-PCfodp8gyjOUgb4FthMlbanbEtJuc6axM8DkQJ/ykLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index f8273e30ae7bd..3c21b0b62e518 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY="; + hash = "sha256-A+9Npy0a6HsuPyi3cdx+BUZKoXliblfDAFlWJahlQnM="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/nlpcloud/default.nix b/pkgs/development/python-modules/nlpcloud/default.nix index 49fdb5e528fa8..55e9233bb5278 100644 --- a/pkgs/development/python-modules/nlpcloud/default.nix +++ b/pkgs/development/python-modules/nlpcloud/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nlpcloud"; - version = "1.1.44"; + version = "1.1.45"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dOW/M9FJJiCii4+lZJ6Pg2bAdSpul4JRtzYdI7VgJbM="; + hash = "sha256-W/O7GhZuACUFCSCCJUUB6UfMB9WSF8uU7Yd/tgPsE0Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index bb6f6decc1a58..981d5dc03729e 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -27,17 +27,17 @@ buildPythonPackage rec { ''; preBuild = lib.optionalString (isPy3k) '' - ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests + ${python.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle checkPhase = if isPy3k then '' - ${python.pythonForBuild.interpreter} setup.py build_tests + ${python.pythonOnBuildForHost.interpreter} setup.py build_tests '' else "" + '' rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python.pythonForBuild.interpreter} selftest.py + ${python.pythonOnBuildForHost.interpreter} selftest.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix index c452a3431cf57..280f36cc2e693 100644 --- a/pkgs/development/python-modules/nose3/default.nix +++ b/pkgs/development/python-modules/nose3/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !isPyPy && !stdenv.isDarwin && !isPy311; checkPhase = '' - ${python.pythonForBuild.interpreter} selftest.py + ${python.pythonOnBuildForHost.interpreter} selftest.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index e6e6f42aaafab..52a6d1c182595 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+wqQ7JKC4aSgdM8YcYlO289CRpwX4VPxVqNlSABJJ0U="; + hash = "sha256-23C3biUUs10Po5qzn3EFaq4+HeWCXIC6WzxOKy59VgM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index caf4028df5775..a8c327a080764 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.108"; + version = "12.535.133"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE="; + hash = "sha256-sVWa8NV90glVv1jQWv/3sWbd1ElH6zBRyZBWOHmesdw="; }; patches = [ diff --git a/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch b/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch new file mode 100644 index 0000000000000..6435d86a68a29 --- /dev/null +++ b/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch @@ -0,0 +1,21 @@ +diff --git a/omegaconf/omegaconf.py b/omegaconf/omegaconf.py +index efde14a..a2a050e 100644 +--- a/omegaconf/omegaconf.py ++++ b/omegaconf/omegaconf.py +@@ -7,6 +7,7 @@ import pathlib + import sys + import warnings + from collections import defaultdict ++from dataclasses import _MISSING_TYPE + from contextlib import contextmanager + from enum import Enum + from textwrap import dedent +@@ -828,6 +829,8 @@ class OmegaConf: + + if obj is _DEFAULT_MARKER_: + obj = {} ++ if isinstance(obj, _MISSING_TYPE): ++ return OmegaConf.create({}, parent=parent, flags=flags) + if isinstance(obj, str): + obj = yaml.load(obj, Loader=get_yaml_loader()) + if obj is None: diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index d506e06d6f671..c6dfada82bd28 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -3,6 +3,7 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, setuptools , jre_minimal , pydevd , pytest-mock @@ -15,8 +16,7 @@ buildPythonPackage rec { pname = "omegaconf"; version = "2.3.0"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -31,6 +31,9 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + + # https://github.com/omry/omegaconf/pull/1137 + ./0000-add-support-for-dataclasses_missing_type.patch ]; postPatch = '' @@ -42,6 +45,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools jre_minimal ]; diff --git a/pkgs/development/python-modules/omemo-dr/default.nix b/pkgs/development/python-modules/omemo-dr/default.nix index 39adbdc7cc3e1..03850fc8cca70 100644 --- a/pkgs/development/python-modules/omemo-dr/default.nix +++ b/pkgs/development/python-modules/omemo-dr/default.nix @@ -1,22 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, cryptography, protobuf }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, protobuf +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "omemo-dr"; - version = "1.0.0"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-sP5QI+lHoXt0D7ftSqJGEg1vIdgZtYEulN/JVwUgvmE="; + hash = "sha256-KoqMdyMdc5Sb3TdSeNTVomElK9ruUstiQayyUcIC02E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography protobuf ]; - meta = { + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "omemo_dr" + ]; + + meta = with lib; { description = "OMEMO Double Ratchet"; - license = lib.licenses.lgpl3; homepage = "https://dev.gajim.org/gajim/omemo-dr/"; + changelog = "https://dev.gajim.org/gajim/omemo-dr/-/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index 4448a686e1a94..45c6ee0a90e50 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "omrdatasettools"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0cdq02jp8vh78yjq9bncjjl0pb554idrcxkd62rzwk4l6ss2fkw5"; + sha256 = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch new file mode 100644 index 0000000000000..5038a5ba52e05 --- /dev/null +++ b/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch @@ -0,0 +1,39 @@ +diff --git a/python/setup.py b/python/setup.py +index 2ac3accd2..f26161c72 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -101,25 +101,6 @@ def get_thirdparty_packages(triton_cache_path): + # ---- package data --- + + +-def download_and_copy_ptxas(): +- base_dir = os.path.dirname(__file__) +- src_path = "bin/ptxas" +- url = "https://conda.anaconda.org/nvidia/label/cuda-12.0.0/linux-64/cuda-nvcc-12.0.76-0.tar.bz2" +- dst_prefix = os.path.join(base_dir, "triton") +- dst_suffix = os.path.join("third_party", "cuda", src_path) +- dst_path = os.path.join(dst_prefix, dst_suffix) +- if not os.path.exists(dst_path): +- print(f'downloading and extracting {url} ...') +- ftpstream = urllib.request.urlopen(url) +- file = tarfile.open(fileobj=ftpstream, mode="r|*") +- with tempfile.TemporaryDirectory() as temp_dir: +- file.extractall(path=temp_dir) +- src_path = os.path.join(temp_dir, src_path) +- os.makedirs(os.path.split(dst_path)[0], exist_ok=True) +- shutil.copy(src_path, dst_path) +- return dst_suffix +- +- + # ---- cmake extension ---- + + +@@ -200,8 +181,6 @@ class CMakeBuild(build_ext): + subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=self.build_temp) + + +-download_and_copy_ptxas() +- + setup( + name="triton", + version="2.0.0", diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 68dfc24aafdaa..e1ac9cb4cef6e 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -1,5 +1,5 @@ { lib -, callPackage +, config , buildPythonPackage , fetchFromGitHub , addOpenGLRunpath @@ -14,10 +14,12 @@ , ncurses , libxml2 , lit +, llvm , filelock , torchWithRocm , python , cudaPackages +, cudaSupport ? config.cudaSupport }: let @@ -33,7 +35,6 @@ let # be executed on the GPU. # Cf. https://nixos.org/manual/nixpkgs/unstable/#sec-cross-infra ptxas = "${pkgsTargetTarget.cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) - llvm = callPackage ./llvm.nix { }; # Use a custom llvm, see llvm.nix for details in buildPythonPackage rec { pname = "triton"; @@ -57,6 +58,8 @@ buildPythonPackage rec { # url = "https://github.com/openai/triton/commit/fc7c0b0e437a191e421faa61494b2ff4870850f1.patch"; # hash = "sha256-f0shIqHJkVvuil2Yku7vuqWFn7VCRKFSFjYRlwx25ig="; # }) + ] ++ lib.optionals (!cudaSupport) [ + ./0000-dont-download-ptxas.patch ]; nativeBuildInputs = [ @@ -102,21 +105,18 @@ buildPythonPackage rec { substituteInPlace bin/CMakeLists.txt \ --replace "add_subdirectory(FileCheck)" "" - # Use our linker flags - substituteInPlace python/triton/compiler.py \ - --replace '${oldStr}' '${newStr}' - # Don't fetch googletest substituteInPlace unittest/CMakeLists.txt \ --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" + '' + lib.optionalString cudaSupport '' + # Use our linker flags + substituteInPlace python/triton/compiler.py \ + --replace '${oldStr}' '${newStr}' ''; # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' - export CC=${cudaPackages.backendStdenv.cc}/bin/cc; - export CXX=${cudaPackages.backendStdenv.cc}/bin/c++; - # Upstream's setup.py tries to write cache somewhere in ~/ export HOME=$(mktemp -d) @@ -127,6 +127,9 @@ buildPythonPackage rec { # The rest (including buildPhase) is relative to ./python/ cd python + '' + lib.optionalString cudaSupport '' + export CC=${cudaPackages.backendStdenv.cc}/bin/cc; + export CXX=${cudaPackages.backendStdenv.cc}/bin/c++; # Work around download_and_copy_ptxas() mkdir -p $PWD/triton/third_party/cuda/bin @@ -137,7 +140,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # Setuptools (?) strips runpath and +x flags. Let's just restore the symlink - postFixup = '' + postFixup = lib.optionalString cudaSupport '' rm -f $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas ln -s ${ptxas} $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas ''; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 622917e8a3e70..ea90e089ec345 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,6 +11,7 @@ , pyudev , setproctitle , wrapGAppsHook +, notify2 }: let @@ -39,6 +40,7 @@ buildPythonPackage (common // { pygobject3 pyudev setproctitle + notify2 ]; postInstall = '' diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 5b22a878c77f4..3b38fcc2c8649 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.13.3"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-4bKQcltUr7q8wHfiRXQcK5dw0TrnMr9/bTNXeOyg7oA="; + hash = "sha256-fCLMDbWfEAG7pTFKWv67fpr6lNTxRTCBkppgDZR51eY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 814c90a698dc2..e40a9a03e7641 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.33"; + version = "0.1.35"; src = fetchPypi { inherit pname version; - hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs="; + hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index c8939f01e9394..1100ae7f6dc6e 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -44,7 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.36.1"; + version = "3.36.2"; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk="; + hash = "sha256-v9lk5vGhBaR2PHZ+Jq0hy1WaCsbeLe+vZlTaHBkfacU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index a3853022f0a6a..e358c2ec49861 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.9"; + version = "1.1.0"; 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-QnXfcbfzRt1sSagnDLP3ZRLH3KNqK76L+KvifTU6MJQ="; + hash = "sha256-HI/lIj9ezdCry5fYDi5Pia6hvOjN6/Slm9BMfLeq8AU="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 10e3cef7a69a8..1f2ddb3d8cfd7 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; }) + (fetchpatch { + name = "_raveled_index_for.patch"; + url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch"; + hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0="; + }) ]; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index b09442627d4bb..576b548605579 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -39,14 +39,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.6.1"; + version = "8.6.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; + hash = "sha256-ibxSp1M85WngQKdjlRC4JvLxn0rEn9oVkid/V4iD6zY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 7b436c697d868..3a8ec63f3e9a4 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.6.1"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-vVCJn8PhLNw0fj+/tTigTEodn9SEKv0VASJf4LKJy20="; + hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index 0408b74ead497..2138d71819784 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.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-nuHHEVOYm2/PkXIs9Ze5y5xyJMLkxqp3q3u4gV8Ks80="; + hash = "sha256-fd/4I6jjc0Wz2+XHGXAGg0Am3Dmw9R2ZX7nymIj/UnA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index bb60adfc4bb25..470c67d6ae071 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; + hash = "sha256-Gy+i/9OTi7S+/+XWFGy8sr2plqWk2p8xq//Ysk4Hsxc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index dad7c762ff254..1d288d2f43890 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.149"; - format = "pyproject"; + version = "2.1.151"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C3RR0WUq63O875v23TQ8GwPGTgGuOqhYhwtfkCMFBfE="; + hash = "sha256-op7V7Xn0qzcCTyISyi/Z4bhdk/W7Ol5YbmvD2Sl5zkM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index f5de2371e01ef..8f7f1e96effed 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -22,11 +22,11 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-C/X427yQR+BkbQFqQhMoomDEbP8hCJCLEbtVyWR17o0="; + hash = "sha256-8v7qIJnOGtXoqdXZOw7a9g3GHpeyG3XpHZcjk5zlO9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 6edc041ed481b..198e7ff2ff382 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub @@ -63,6 +64,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/bigcat88/pillow_heif/issues/89 + # not reproducible in nixpkgs + "test_opencv_crash" + ]; + meta = { changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/v${version}"; description = "Python library for working with HEIF images and plugin for Pillow"; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 250ad2f2399d2..7e15814fa6849 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.13.0"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-mblj6SQK/az2al81wMiWXHuyn1+30jfAxrWGv9Nw/gw="; + hash = "sha256-rlnJmGe9LYwIJxV02IjiKtT1iS1O9ik8dAfjsPHsa8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 57b4cb430b77a..fc177fc433cbb 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.4"; + version = "4.15.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-NBV4jrLfU5vqQljQh28tJxgaNSo/ilph8xsjdVKCOJg="; + hash = "sha256-kguy8sZtc8vHuWWqQqPPuDE5DgyWs/H62yxjv5VabFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 677d6c2a72455..4541cac8b14ee 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -72,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/containers/podman-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "podman"; }; } diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix index 22e7e0c3916d1..ee8165858933e 100644 --- a/pkgs/development/python-modules/polling/default.nix +++ b/pkgs/development/python-modules/polling/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful polling utility in Python"; - homepage = "http://github.com/justiniso/polling"; + homepage = "https://github.com/justiniso/polling"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 8d5969d18f082..87a91743b674c 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.5"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "byllyfish"; repo = "precis_i18n"; rev = "refs/tags/v${version}"; - hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U="; + hash = "sha256-0Z8JbakShuB8FFGl3NS8VFpHAQgr2P900HVxUafAmyU="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index c9a1f710b671b..f9ea8ec99dc03 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.9.2"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ki2s057aqaZa+kOpAlhBYFpZeuDX42+txQXFuBtXd04="; + hash = "sha256-1oy0gXHDAoCIPXAitQv6MRb3p2j89zBaZvpUni6wT8A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 613222d5089ee..f16fa4cedfd9c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231105"; + version = "0.10.0.20231109"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+/r2gVtA0j+aY827B0wZCOlogil7921V94/bay8/dVg="; + hash = "sha256-cr2rEoGVJ8BeXLfyPq4Auxu7OEOlVnKxlSMUREmji2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-pdf-parser/default.nix b/pkgs/development/python-modules/py-pdf-parser/default.nix index 91d044a366a1d..93ffeacb08a77 100644 --- a/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "py-pdf-parser"; - version = "0.11.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GsiGBigvtAgrM0sRffZBG2tVoEaDai+eUxXhMXWNBr0="; + hash = "sha256-nMEmzQVz1LR4omHyxhvrjBXDQQE23S62T0wxZeMnXhg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d635a6a4a88cb..45ac825c6a561 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.53"; + version = "3.54"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; + hash = "sha256-xRiXFCILZeiNYJMIJ8Qxga71/7WXeTUsdnRvfvDzpCY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 9e6802ff17490..6bb98d07f3453 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.0.9"; + version = "3.0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RGU4UF+Nhfc2LGQlYf8ImrmDf2009JTSx6cO4o3VuDI="; + hash = "sha256-HvmD1Hi8GCwuox11v0/VdVQlmF5dpPjhgSNfLScz5TY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 92ccf8e071b8f..5c37066ae9d19 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.5.0"; + version = "7.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-GucatimZTg0Fggrz4bG1x6YSa3wE/uLGB4ufil/km3w="; + hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 7169a4022f639..fb7fedeaefc59 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; configureFlags = [ - "PYTHON=${python.pythonForBuild.interpreter}" + "PYTHON=${python.pythonOnBuildForHost.interpreter}" ]; postPatch = '' diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index fe29cde9e5226..e2b216d1724ba 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -17,7 +17,7 @@ name = "pybind11-setup-hook"; substitutions = { out = placeholder "out"; - pythonInterpreter = python.pythonForBuild.interpreter; + pythonInterpreter = python.pythonOnBuildForHost.interpreter; pythonIncludeDir = "${python}/include/python${python.pythonVersion}"; pythonSitePackages = "${python}/${python.sitePackages}"; }; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ff2f2e5819067..6aa58056cad91 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index e1e1e37f0c659..db90dcce9492e 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.1.1"; + version = "2.2.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I="; + hash = "sha256-W/sD/Nh2k1z7YvFVnQB9dGa1bXoCTb4QrPk/1mi4Hdk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 8345a3da20655..118e4ed66b5e6 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub # Python deps , blockfrost-python +, cachetools , cbor2 , cose , ecpy @@ -29,7 +30,7 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; @@ -37,11 +38,12 @@ in buildPythonPackage rec { owner = "Python-Cardano"; repo = "pycardano"; rev = "v${version}"; - hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; }; propagatedBuildInputs = [ blockfrost-python + cachetools cbor2 cose_0_9_dev8 ecpy diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 06f3afb64deae..8c2005c0cc2cd 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -24,15 +24,15 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2022.2.2"; + version = "2023.1"; src = fetchPypi { inherit pname version; - hash = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; + hash = "sha256-F1/2dfDPEOOOmtwD7V3z7Y2Kv32lE0yNzOx1LooKPpE="; }; preConfigure = with lib.versions; '' - ${python.pythonForBuild.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ + ${python.pythonOnBuildForHost.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ --boost-python-libname=boost_python${major python.version}${minor python.version} \ diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 57031c90f97cb..3a22435412910 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -1,21 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, requests , setuptools , setuptools-scm -, requests }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.3.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gagebenne"; - repo = pname; + repo = "pydexcom"; rev = "refs/tags/${version}"; - hash = "sha256-VZ8Y8W3oEQ3W8eubMbHLfQAXK8cL6+OTyBFwtEe0cBE="; + hash = "sha256-46+Ml73F6EUbMwRJB93FD+No/g65RJwnCnFzH4Pb5ek="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -25,15 +28,21 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; - # tests are interacting with the Dexcom API + # Tests are interacting with the Dexcom API doCheck = false; - pythonImportsCheck = [ "pydexcom" ]; + + pythonImportsCheck = [ + "pydexcom" + ]; meta = with lib; { description = "Python API to interact with Dexcom Share service"; homepage = "https://github.com/gagebenne/pydexcom"; + changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 22c281dce3e6b..dc36f149a9b1c 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2023.10.0"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-CSjYLiOvnm1kFp4DL3w/YmAsDcbaCfLfGT0xUZy+GZ0="; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index 365490a224c59..237570b0e9ca0 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.11.0"; + version = "2023.11.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-XtNaghYVoE28Dp6YY92SNy0Zw2BxZLYX83EzUSvx/HM="; + hash = "sha256-gLP5N07msjuQeeyjbCvZK4TrVyZKUCSSKsjNY5Pa9gQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 6e1ab078dd456..b6dd8ac849110 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.14.1"; + version = "1.14.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-IK+PaLE2hDLPfxsXqypFXpVYpQH+6VynIq7aGVUZkm4="; + hash = "sha256-8tBxepvNT+EVGKRhLqmAaLYvmf4J2Jquz0R8sSLUCH8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 6c7c30fe384de..5ef572c481756 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.2"; + version = "0.2.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g="; + hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 7df84ea78abd9..d339389057535 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ trio ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_cython + ${python.pythonOnBuildForHost.interpreter} setup.py build_cython ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index f4ceeb9b978cd..5352ef65d7f31 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { ]; preConfigure = '' - ${python.pythonForBuild.interpreter} buildconfig/config.py + ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; checkPhase = '' diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index f5e0bf87b1d25..a31725a1002b8 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { # for the package to function. Therefore override of buildPhase was # necessary. buildPhase = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace - ${python.pythonForBuild.interpreter} setup.py bdist_wheel + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index e27a5d99f4e57..393ec9f2e4cc9 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.9"; + version = "2.0.10"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oJIuQvLSWFBWeOL0o1XFR2waY1LD86N3VAQt23589y8="; + hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index ae10f84995a1b..91d7fa7eb5196 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -3,16 +3,16 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, poetry-core , lsprotocol , typeguard -, poetry-core , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pygls"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-FOuBS/UJpkYbuIu193vkSpN/77gf+UWiS5f/t8BpAk4="; + hash = "sha256-OfLlYTgVCg+oiYww0RjRTjiBwTZBSNqJRryo8gZEmk4="; }; nativeBuildInputs = [ @@ -49,9 +49,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; meta = with lib; { - changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; + changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix index 312faf202bb02..a5218555b36bf 100644 --- a/pkgs/development/python-modules/pygnmi/default.nix +++ b/pkgs/development/python-modules/pygnmi/default.nix @@ -6,18 +6,21 @@ , grpcio , protobuf , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pygnmi"; - version = "0.8.12"; + version = "0.8.13"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "akarneliuk"; repo = "pygnmi"; - rev = "v${version}"; - sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NkByimHk1DoBjMMD7ywplo38VxBpp1pnClYUzhtKwY4="; }; propagatedBuildInputs = [ @@ -35,11 +38,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pygnmi" ]; + pythonImportsCheck = [ + "pygnmi" + ]; meta = with lib; { description = "Pure Python gNMI client to manage network functions and collect telemetry"; homepage = "https://github.com/akarneliuk/pygnmi"; + changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index b8337aea56215..6d5615a780e5f 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; passthru = { diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix index e4cebb02c66d4..98496bf4a54b5 100644 --- a/pkgs/development/python-modules/pyjnius/default.nix +++ b/pkgs/development/python-modules/pyjnius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyjnius"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C32+PY9Yu7e+wwyFjz+nibzBwexJMZWOn3uH9F6hQDM="; + hash = "sha256-0qfs5u15vx1/l6T21hMC2fHXZSGCo+TIpp267zE5bmA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix deleted file mode 100644 index 8869924bddba7..0000000000000 --- a/pkgs/development/python-modules/pymaging/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -}: - -buildPythonPackage { - pname = "pymaging"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging"; - rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; - sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; - }; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "http://pymaging.rtfd.org"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix deleted file mode 100644 index 6d12ddd40062c..0000000000000 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pymaging -}: - -buildPythonPackage { - pname = "pymaging-png"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging-png"; - rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; - sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; - }; - - propagatedBuildInputs = [ pymaging ]; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "https://github.com/ojii/pymaging-png/"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index e511c24fccdef..4c8d6aee1e49f 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; + hash = "sha256-GGoLQalFJPCYTQhcprlFx5olRGW3CX8lYNwMBOjR2KU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index cab8e00401482..4e16030d95759 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , aiohttp , async-timeout -, pytz , xmltodict +, pythonOlder }: buildPythonPackage rec { pname = "pymetno"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; rev = "refs/tags/${version}"; - hash = "sha256-NikfHQwVviCKWGfY1atirFVaqWQHfXg8WAgZIDnGn4Q="; + hash = "sha256-wRSUIaonjjucLM+A4GsF9Lrq2vZYCquEvblbmjKYpQE="; }; propagatedBuildInputs = [ aiohttp async-timeout - pytz xmltodict ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to communicate with the met.no API"; homepage = "https://github.com/Danielhiversen/pyMetno/"; + changelog = "https://github.com/Danielhiversen/pyMetno/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 8df9d0c7e9185..f649f9bba0ad6 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 0d0171b1b066d..fb796ab6c331b 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -25,14 +25,10 @@ buildPythonPackage rec { }; patches = [ - # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207 + # https://github.com/lmcinnes/pynndescent/pull/224 (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch"; - hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch"; - hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y="; + url = "https://github.com/lmcinnes/pynndescent/commit/86e0d716a3a4d5f4e6a0a3c2952f6fe339524e96.patch"; + hash = "sha256-dfnT5P9Qsn/nSAr4Ysqo/olbLLfoZXvBRz33yzhN3J4="; }) ]; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 458cd0afb277c..f164e91b7b9da 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.12.3"; + version = "1.13.1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9+HP95OsJIXsLy+6m6fWECU3jXxY++C3wQJBcqnC+H0="; + hash = "sha256-LahLR+LbppcPKs0gPT2lEP48XG6pbGMvCBW/EwAIFDQ="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index facbdbc1bb831..29c131a12f9fe 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.12.2"; + version = "1.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-TmdiUca87ViuBHB3ZvD3kv1VjKSmYx1G78Uowf3/w5Q="; + hash = "sha256-55oqrVjvbdwNn5S3YQVU3saWtFHhoUCcyW9VzXs87YM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 4d473ae094d8c..84d8439a5360b 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -1,11 +1,11 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , isPyPy , pkgs , python , six +, pytestCheckHook }: buildPythonPackage rec { @@ -31,31 +31,14 @@ buildPythonPackage rec { tests/test__ped_ped.py ''; - patches = [ - ./fix-test-pythonpath.patch - (fetchpatch { - url = "https://github.com/dcantrell/pyparted/commit/07ba882d04fa2099b53d41370416b97957d2abcb.patch"; - hash = "sha256-yYfLdy+TOKfN3gtTMgOWPebPTRYyaOYh/yFTowCbdjg="; - }) - (fetchpatch { - url = "https://github.com/dcantrell/pyparted/commit/a01b4eeecf63b0580c192c7c2db7a5c406a7ad6d.patch"; - hash = "sha256-M/8hYiKUBzaTOxPYDFK5BAvCm6WJGx+693qwj3HzdRA="; - }) - ]; - preConfigure = '' PATH="${pkgs.parted}/sbin:$PATH" ''; nativeBuildInputs = [ pkgs.pkg-config ]; - nativeCheckInputs = [ six ]; + nativeCheckInputs = [ six pytestCheckHook ]; propagatedBuildInputs = [ pkgs.parted ]; - checkPhase = '' - patchShebangs Makefile - make test PYTHON=${python.executable} - ''; - meta = with lib; { homepage = "https://github.com/dcantrell/pyparted/"; description = "Python interface for libparted"; diff --git a/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch b/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch deleted file mode 100644 index 740bffbef6d8d..0000000000000 --- a/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 1980-01-02 00:00:00.000000000 +0100 -+++ b/Makefile 2020-02-18 20:04:14.068243263 +0100 -@@ -39,19 +39,19 @@ - @$(PYTHON) setup.py build - - test: all -- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - $(PYTHON) -m unittest discover -v - - coverage: all - @echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***" -- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - $(COVERAGE) run --branch -m unittest discover -v - $(COVERAGE) report --include="build/lib.*/parted/*" --show-missing - $(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log - - check: clean - env PYTHON=python3 $(MAKE) ; \ -- env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - tests/pylint/runpylint.py - - dist: diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 1f616e00acbee..1ed1b31b5d57c 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-Rd2nHsEYfr1I5gu2+iXIdHKvF/QgMD+vK6SIK/ytrmo="; + hash = "sha256-+wa8HxQyEwdGF2LWJXTZ/gOFpC8P9+k5p4Lj3ePP2n8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 5dfa7fb823fa8..1d4cf2ce60389 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside2 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside2 cp -r PySide2.egg-info $out/${python.sitePackages}/ ''; diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index e03516742527d..17e98a85089d3 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside6 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6 cp -r PySide6.egg-info $out/${python.sitePackages}/ ''; diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index fc21919a63ab6..3edc3b57cc4de 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.2.5"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "truenas"; repo = "py-SMART"; - rev = "v${version}"; - hash = "sha256-NqE7Twl1kxXrASyxw35xIOTB+LThU0a45NCxh8SUxfI="; + rev = "refs/tags/v${version}"; + hash = "sha256-1k+5XnIT/AfZmzKUxkyU/uc0eW05CvugpY6OdJCoALc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index e1d3a631549dc..36d86db14450a 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.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dFqNWJRDDTlvveZVv3WWUi+KJ8sey4N0qRuBcqmkWIM="; + hash = "sha256-QUgBA/bchWTaJ54u/ubcRfoVcDeV77wSnHOjkgfVauE="; }; PYSPTK_BUILD_VERSION = 0; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 33daf6af75df2..92d76cb06dcd7 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { preConfigure = '' cd Source - ${python.pythonForBuild.interpreter} setup.py backport - ${python.pythonForBuild.interpreter} setup.py configure \ + ${python.pythonOnBuildForHost.interpreter} setup.py backport + ${python.pythonOnBuildForHost.interpreter} setup.py configure \ --apr-inc-dir=${apr.dev}/include \ --apu-inc-dir=${aprutil.dev}/include \ --pycxx-dir=${pycxx.dev}/include \ diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index b0893b5d204e1..6cbde872a48f1 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.2.18"; + version = "3.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z3HD7sjDg8dMNpd93PiN+nSzKTVCw+OJnfKX07e1+sg="; + hash = "sha256-kY1tPkzmUN5eb6YeUp/WSVmDloVSJbM5TXEFyfoXc/g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 28f45c02dd80c..3c0b0ec629b43 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.0.13"; + version = "2.1.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WJ0Br8O7p5Zru4Fr9+adXp5qjR7sZxBZVtBJghecm9E="; + hash = "sha256-M4636yqzChRI37UdGPOZTjj8POLdrOoJtzmECtZZi4k="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/v${version}"; - license = licenses.agpl3Only; + license = licenses.mit; maintainers = with maintainers; [ dmvianna ]; }; } diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 20a4819948ad1..2949b8b7ea9d5 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.6.2"; + version = "7.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-1n+3Rl945NQ3Ugd6UKhN429vTz1ky2Qr43fI0TrgrBU="; + hash = "sha256-lZ+9l1kPE/Piw1QLYW+qjFQmTtZd4m/kDOTOxkTsla0="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 972bbca9c4142..d4a2ca1dd6b5e 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext ''; installPhase = '' - ${python.pythonForBuild.interpreter} setup.py install --prefix=$out --single-version-externally-managed + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 45c94cdb83b3e..9a1416e0dbd67 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext -i + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext -i ''; checkPhase = '' diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index af0671279ab15..e4ff8f1e7e511 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -7,7 +7,7 @@ , pyyaml , setuptools , six -, multi_key_dict +, multi-key-dict , testscenarios , requests , requests-mock @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - hash = "sha256-/18dklOdkD+GmwLq8rExREfm1tePdn7c/dkpZ9UyucY="; + hash = "sha256-VufauwYHvbjh1vxtLUMBq+2+2RZdorIG+svTBxy27ss="; }; # test uses timeout mechanism unsafe for use with the "spawn" @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + propagatedBuildInputs = [ pbr pyyaml setuptools six multi-key-dict requests ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index 07a389268e777..eae9047c9f9d5 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "1.5.2"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - sha256 = "sha256-7vilIo1PHgHZ6yaRxTVt/bPwGt9g7rGvrq84eyIDIBw="; + sha256 = "sha256-vf3ZNZyen1W29qk4ST1sus5VTcys9F3067NlUr406bg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 4886ba27bad69..763154732943a 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.8.2"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jD/8Xy/o9U/qtjz5FABg5krMIvbnrT+MlK0OvXFTJkI="; + hash = "sha256-9za0et/W+AwrjqUVoHwk8oqLXk4eqgRON8Z4F5GSKXM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-pptx/default.nix b/pkgs/development/python-modules/python-pptx/default.nix index d783efa714252..e49dccec8206a 100644 --- a/pkgs/development/python-modules/python-pptx/default.nix +++ b/pkgs/development/python-modules/python-pptx/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "python-pptx"; - version = "0.6.22"; + version = "0.6.23"; src = fetchPypi { inherit pname version; - hash = "sha256-OPjukt3jHSS0ViVg5hsDV+XZfs91xDUq5mFtWjKXhlQ="; + hash = "sha256-WHSX/yjneasY27B09tQFKJPIXe3JXtdd8xk2TzMf7e4="; }; # postPatch = '' diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index 44deb68dc6d96..3f73bf1e5a941 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.15.2"; + version = "0.16"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rytilahti"; repo = "python-songpal"; rev = "refs/tags/release/${version}"; - hash = "sha256-bAlMOxX4rx4URk+xvlte7l005i3H0VDaH67AWMdhTeY="; + hash = "sha256-wHyq63RG0lhzG33ssWyvzLjc7s1OqquXMN26N2MBHU8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram/default.nix b/pkgs/development/python-modules/python-telegram/default.nix index 405f74bebda8d..50a14d6ccc279 100644 --- a/pkgs/development/python-modules/python-telegram/default.nix +++ b/pkgs/development/python-modules/python-telegram/default.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchpatch , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , setuptools , tdlib +, telegram-text +, pytestCheckHook }: buildPythonPackage rec { @@ -13,30 +14,33 @@ buildPythonPackage rec { version = "0.18.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-UbJW/op01qe/HchfJUlBPBY9/W8NbZkEmFM8gZ5+EmI="; + src = fetchFromGitHub { + owner = "alexander-akhmetov"; + repo = "python-telegram"; + rev = version; + hash = "sha256-2Q0nUZ2TMVWznd05+fqYojkRn4xfFZJrlqb1PMuBsAY="; }; - patches = [ - # Search for the system library first, and fallback to the embedded one if the system was not found - (fetchpatch { - url = "https://github.com/alexander-akhmetov/python-telegram/commit/b0af0985910ebb8940cff1b92961387aad683287.patch"; - hash = "sha256-ZqsntaiC2y9l034gXDMeD2BLO/RcsbBII8FomZ65/24="; - }) - ]; - postPatch = '' # Remove bundled libtdjson rm -fr telegram/lib substituteInPlace telegram/tdjson.py \ - --replace "ctypes.util.find_library(\"libtdjson\")" \ + --replace "ctypes.util.find_library(\"tdjson\")" \ "\"${tdlib}/lib/libtdjson${stdenv.hostPlatform.extensions.sharedLibrary}\"" ''; propagatedBuildInputs = [ setuptools + telegram-text + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "TestGetTdjsonTdlibPath" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 138dc5f502fa4..56473cc95ae26 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -8,6 +8,7 @@ , torch , torchvision , typing-extensions +, pythonAtLeast }: buildPythonPackage rec { @@ -41,6 +42,7 @@ buildPythonPackage rec { "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py" "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py" "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py" + "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py" # RuntimeError: No Op registered for Gradient with domain_version of 9 "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py" @@ -53,13 +55,15 @@ buildPythonPackage rec { "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy.py" "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py" "tests/pytorch_pfn_extras_tests/runtime_tests/test_to.py" - "tests/pytorch_pfn_extras_tests/test_handler.py" - "tests/pytorch_pfn_extras_tests/test_logic.py" + "tests/pytorch_pfn_extras_tests/handler_tests/test_handler.py" "tests/pytorch_pfn_extras_tests/test_reporter.py" "tests/pytorch_pfn_extras_tests/training_tests/test_trainer.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_checkpoint.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_comparer.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_new_comparer.py" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Remove this when https://github.com/NixOS/nixpkgs/pull/259068 is merged + "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix new file mode 100644 index 0000000000000..ef54cf77b4f26 --- /dev/null +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, orjson +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +, rich +, syrupy +, tenacity +, typer +}: + +buildPythonPackage rec { + pname = "pytrydan"; + version = "0.4.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "dgomes"; + repo = "pytrydan"; + rev = "refs/tags/v${version}"; + hash = "sha256-9PyRICtZ+0Ezinu28oFgFOSnOyCmD7zZbdc/chN+sCo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=pytrydan --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + orjson + rich + tenacity + typer + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + syrupy + ]; + + pythonImportsCheck = [ + "pytrydan" + ]; + + meta = with lib; { + description = "Library to interface with V2C EVSE Trydan"; + homepage = "https://github.com/dgomes/pytrydan"; + changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index c19e16cae96ee..c2af4be8df86b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.75"; + version = "9.2.76"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-8P8xOb4P1JsbPZya8s1Bl16VsYtHQdAD05sc8EAcEpM="; + hash = "sha256-JlwqxKJaJ3sk2mROUOaF0N5d4V7LM43VqEXnuSO45BY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 4015715c4515c..591fb0026c2bd 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} pywayland/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} pywayland/ffi_build.py ''; # Tests need this to create sockets diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 2350b14da0542..248af392f1fc4 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} wlroots/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} wlroots/ffi_build.py ''; pythonImportsCheck = [ "wlroots" ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 1ab12f28412ca..f480217aa621e 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 = "4.0.0"; + version = "4.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-KkV61pBkIh+4Qav9TVobEBUCyMa6Xqg+eygnOoQRpcQ="; + hash = "sha256-s1d8oTrmptS3exUqn9HSSla6P4dIxS/qNalsDTbFmFs="; }; pythonImportsCheck = [ "qpsolvers" ]; diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index ab33203d70112..a1b0a4309554e 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk="; + hash = "sha256-zI6oUHO4rY/BbbHhvzSNIKCpTDRm0cK46rIKN/ISgY0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index e5db1cbad3ce0..f0f9070180ef9 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.17.0"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-4cGUF4Qh5+mxHtKNnAjh37Q6hEFCQ9zmntya98UHx+0="; + hash = "sha256-9Wt+W7PWUVijzAeZMvcOl/Na60OCCGJJqxh2UaAxAcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rank_bm25/default.nix b/pkgs/development/python-modules/rank-bm25/default.nix index 4019864f27d6b..9b0c5080449d1 100644 --- a/pkgs/development/python-modules/rank_bm25/default.nix +++ b/pkgs/development/python-modules/rank-bm25/default.nix @@ -5,7 +5,7 @@ , numpy }: let - pname = "rank_bm25"; + pname = "rank-bm25"; version = "0.2.2"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 2ac13e9a47f1c..060fafa8d6e07 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk="; + hash = "sha256-igrYMgPemYVGDR+eWiqtxFxFjroCyOfKEU0wj8D7ZS8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 23e7f0f80b626..499ad3c23d07e 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patchPhase = "cat ${./sitecustomize.py} > sitecustomize.py"; - buildPhase = "${python.pythonForBuild}/bin/${python.pythonForBuild.executable} -m compileall ."; + buildPhase = "${python.pythonOnBuildForHost}/bin/${python.pythonOnBuildForHost.executable} -m compileall ."; installPhase = '' diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index af0170cbf322a..aec5311351e47 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; preBuild = '' - ${python.pythonForBuild.interpreter} make_sync.py + ${python.pythonOnBuildForHost.interpreter} make_sync.py ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 5b4e8eb6bd3ed..832d843847591 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.14"; + version = "0.7.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-fF/IwhHCTqi5eSRgfcUARWAqQ7jJ4nRpcWWOMx7IxLY="; + hash = "sha256-BSl7dECYJIjR9QTvcizUF3Lz1jmgm9xi4kPt7PdO/Nk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 63cdb2fda21d6..1c5417c75a19e 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.11.0"; + version = "3.12.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-5fv2DSMeCleDxsW+nua2dOOeWZIZfuP+Qo++w2YEf4Q="; + hash = "sha256-bKv9APbraR2359IzzkzXs4sEXrTvGK3J4LO3wFHOti0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 0fde4435543d4..7dc2878d391d0 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; - rev = "v${version}"; - hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U="; + rev = "refs/tags/v${version}"; + hash = "sha256-iQ8x8UM0zmb2qYUpSh6RSEaBMrDpwY0ZHaJ9GJqn4Hs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index d326963dc8aa9..4eea1c1ab677d 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-GKvtplzvSHCsSA4KJvtltzDy/gKpeFx05Ib1j69c09g="; + hash = "sha256-u5GMCM9HyrblGbmIvfDWTfIAV8Zpn8tF0oOaolFtQMk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index 1cbf6c905715a..6af50237e4bb8 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "rpmfile"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZxcHe1QxdG2GBIPMNrnJy6Vd8SRgZ4HOtwsks2be8Cs="; + sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; }; # Tests access the internet diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 8a49792d25eeb..2c7254fdcfdfe 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.193.0"; + version = "2.197.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-5wMLzZjHgHGuIBxG0GNOVj1t32kEJ9scrS6bA6IW4WY="; + hash = "sha256-d4HbwzgVfuo6n4FD/nl88XeQi/FPRrlq8AIV/eZz9f4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 130e56896e31c..a2cf6d82a35be 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -27,12 +27,13 @@ , setuptools , pytestCheckHook , pytest-cov +, pytest-mock }: buildPythonPackage rec { pname = "scikit-rf"; - version = "0.29.0"; - format = "pyproject"; + version = "0.29.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rBOw1rIEF8Ia6xXlXxVzRRiUxrOjOAlipFuKiL+gRl0="; + hash = "sha256-sLE6rcBGUKmk5y7oO06rHON3GVIjcvnKlr6Tgddj64Y="; }; buildInputs = [ @@ -88,6 +89,7 @@ buildPythonPackage rec { coverage flake8 pytest-cov + pytest-mock nbval matplotlib pyvisa @@ -99,6 +101,12 @@ buildPythonPackage rec { pytestCheckHook ]; + # test_calibration.py generates a divide by zero error on darwin + # https://github.com/scikit-rf/scikit-rf/issues/972 + disabledTestPaths = + lib.optional (stdenv.isAarch64 && stdenv.isDarwin) + "skrf/calibration/tests/test_calibration.py"; + pythonImportsCheck = [ "skrf" ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index b2c4218e5f33a..9a766cedece31 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.21.0"; - format = "setuptools"; + version = "0.22.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rcdEtlmD3O2BQuwxRlOJ/HOEBdWJBRJR5UR6rZoeArw="; + hash = "sha256-Ft0Hg5iF9Sb9VSOsFMgfAvc4Nsam216kzt5Xv2iykv8="; }; nativeBuildInputs = [ @@ -45,6 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # treat numpy versions as lower bounds, same as setuptools build + postPatch = '' + sed -i 's/numpy==/numpy>=/' pyproject.toml + ''; + # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 preCheck = '' @@ -63,10 +68,13 @@ buildPythonPackage rec { "test_pandas_inputs" "test_survival_svm" "test_tree" - ]; + ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) + # floating point mismatch on aarch64 + # 27079905.88052468 to far from 27079905.880496684 + "test_coxnet" + ; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Survival analysis built on top of scikit-learn"; homepage = "https://github.com/sebp/scikit-survival"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index de5bbed119988..fef58d973ccfa 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.13.0rc0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mwaskom"; repo = "seaborn"; rev = "refs/tags/v${version}"; - hash = "sha256-bNuTDXUjdOwqJN1U20eaeSa4/Q3Fe2XMqulqVmDLFEU="; + hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index cc4acb340d572..d138bcb2940cc 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.32.0"; + version = "1.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-chDgy3U29X/xk+aQok9uODcN0iAds1H39yXk98/3Yzc="; + hash = "sha256-a73SZssiS1i3pfble0dMw6st5Hq4AIdJA+dnT617kXg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptools-trial/default.nix index 9304fee0e4231..14f666d311a24 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptools-trial/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , twisted }: buildPythonPackage rec { pname = "setuptools-trial"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-FCIPj3YcSLoeJSbwhxlQd89U+tcJizgs4iBCLw/1mxI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index b736c17337a9c..4afa930cac0b4 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken2 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken2 cp -r shiboken2.egg-info $out/${python.sitePackages}/ rm $out/bin/shiboken_tool.py ''; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index ca227a625b73a..134bc4ff2d438 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -61,7 +61,7 @@ stdenv'.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken6 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6 cp -r shiboken6.egg-info $out/${python.sitePackages}/ ''; diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index ab075702dae0a..bb535e7c10f59 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , matplotlib @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-1CU/Iz83CKRx7dsOTGfdJm98TUfc2kxCHKIEUXP36HQ="; }; + # patch dated use of private matplotlib interface + # https://github.com/aresio/simpful/issues/22 + postPatch = '' + substituteInPlace simpful/simpful.py \ + --replace \ + "next(ax._get_lines.prop_cycler)['color']" \ + "ax._get_lines.get_next_color()" + ''; + propagatedBuildInputs = [ numpy scipy @@ -46,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Library for fuzzy logic"; homepage = "https://github.com/aresio/simpful"; changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 20f43924b9d08..417c1c1fe3515 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder -, pytestCheckHook +, setuptools , gym , gymnasium , torch @@ -11,13 +10,13 @@ , tqdm , wandb , packaging +, pytestCheckHook }: buildPythonPackage rec { pname = "skrl"; version = "1.0.0"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -27,14 +26,7 @@ buildPythonPackage rec { hash = "sha256-89OoJanmaB74SLF1qMI8WFBdN1czS7Yr7BmojaRdo4M="; }; - patches = [ - # remove after next release: - (fetchpatch { - name = "fix-python_requires-specification"; - url = "https://github.com/Toni-SM/skrl/pull/62/commits/9b554adfe2da6cd97cccbbcd418a349cc8f1de80.patch"; - hash = "sha256-GeASMU1Pgy8U1zaIAVroBDjYaY+n93XP5uFyP4U9lok="; - }) - ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ gym diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 0514c9e41971a..7f25c4281c37b 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -198,6 +198,30 @@ "license": "cc-by-sa-40" }, { + "pname": "ja_core_news_lg", + "version": "3.7.0", + "sha256": "1nb77kivzy0wixsw8ijmw78fffkpqa63kykqph04jzmh75ra4wvg", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_md", + "version": "3.7.0", + "sha256": "0p22bwc24q76cl7ndszvhqgllvq3ws3i3vbjsp5xvhxxls6p49x9", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_sm", + "version": "3.7.0", + "sha256": "0bfvkds4dqynjshk2lxfya9yfcnbvwjfhc6n7yh0852ms1ycicaw", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_trf", + "version": "3.7.0", + "sha256": "0n2lqql4flnilgf671n5mcdp8vi5pdjfz3vymxsapc1gyp29jykk", + "license": "cc-by-sa-30" + }, + { "pname": "it_core_news_lg", "version": "3.7.0", "sha256": "0gwn6pf0rzbplahs2wnzp6379mmj066dqhijhq4ln4552fz4d1yx", @@ -378,6 +402,30 @@ "license": "mit" }, { + "pname": "sl_core_news_lg", + "version": "3.7.0", + "sha256": "128ayhp21szc31ckiq3i8vib42i9xnz4lpi1709gjdc38cpmpnlp", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_md", + "version": "3.7.0", + "sha256": "07gx174gw5q1zgyyg1xhfplihhnr311f9562ri5pdd2hgjyz58yb", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_sm", + "version": "3.7.0", + "sha256": "005xwsnh5y3pf8y64lhvrzcbh8y34yr3in204as6hv7krsfg8bxa", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_trf", + "version": "3.7.0", + "sha256": "0x97lwm1i2dq4kdg6rvarh9mnlcx45cnwq80qpjwv3b7zmviyq8c", + "license": "cc-by-sa-40" + }, + { "pname": "sv_core_news_lg", "version": "3.7.0", "sha256": "05qaff8r3vs30zaxja1lgpibd12njp9ciq49zs26i6d4dqa18hdp", diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 0aff8f37caa44..921669d4ca711 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "0.3.1"; + version = "1.0.0"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "9c8ea9980ea0e57bf3ce98f6a400f9b69eb1df808f7dd796c9c8cc1873d8b355"; + sha256 = "sha256-990JX/OrD7dKMQ1BCwo2GPwd3G8s5DWJfWWayqSj6yQ="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index e68f9db10193e..f62c4d7c9ede4 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.4"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0="; + hash = "sha256-M2hCbARFfgIRiE6SdPpH61ViUrpMBz3ydeg8Zd97oqE="; }; propagatedBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { description = "Jupyter kernels for Spyder's console"; homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; - changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 9722222905a08..a70ef94409f74 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.5"; + version = "5.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo="; + hash = "sha256-zjQmUmkqwtXNnZKssNpl24p4FQscZKGiiJj5iwYl2UM="; }; patches = [ diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 6a4ea78b82e0b..06d2534eb2348 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; - homepage = "http://www.sqlobject.org/"; + homepage = "https://www.sqlobject.org/"; changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst"; license = licenses.lgpl21Only; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 5309312bba351..adc6db83dd9bd 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.28"; + version = "2.17.32"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NdWQiHu5YDIEtL4zJj5Vydjmwq1b5aqVcmqIe7zYv3g="; + hash = "sha256-dTpz2/XXu8patDnorg/36652j9VLUjE5uF2fVzbDjfI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index c770cce0fdffc..9b05380d423e3 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.28.0"; + version = "1.28.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vm/SQOKQvip5hXsa14IrU6PJDxXPbOl9iev02ALX7bE="; + hash = "sha256-zKBPbZWxS3vDfwyrrydQS4ava04a+Y1zrMgOzc+8xJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch b/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch new file mode 100644 index 0000000000000..ad0ecbb113016 --- /dev/null +++ b/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch @@ -0,0 +1,26 @@ +diff --git a/stytra/gui/fishplots.py b/stytra/gui/fishplots.py +index 49ef1fe..fd1cc50 100644 +--- a/stytra/gui/fishplots.py ++++ b/stytra/gui/fishplots.py +@@ -13,7 +13,7 @@ from lightparam.gui import ParameterGui + from scipy.ndimage.filters import gaussian_filter1d + + +-class StreamingPositionPlot(pg.GraphicsWindow): ++class StreamingPosition(pg.GraphicsView): + """Plot that displays the virtual position of the fish""" + + def __init__(self, *args, data_accumulator, n_points=500, **kwargs): +diff --git a/stytra/utilities.py b/stytra/utilities.py +index f79c4db..feaa7ef 100644 +--- a/stytra/utilities.py ++++ b/stytra/utilities.py +@@ -239,7 +239,7 @@ def recursive_update(d, u): + :return: + """ + for k, v in u.items(): +- if isinstance(v, collections.Mapping): ++ if isinstance(v, collections.ChainMap): + d[k] = recursive_update(d.get(k, {}), v) + else: + d[k] = v diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 01907cb15b03d..821aaa41437c8 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -33,8 +33,7 @@ buildPythonPackage rec { pname = "stytra"; version = "0.8.34"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { @@ -42,10 +41,10 @@ buildPythonPackage rec { sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; - # crashes python - preCheck = '' - rm stytra/tests/test_z_experiments.py - ''; + patches = [ + # https://github.com/portugueslab/stytra/issues/87 + ./0000-workaround-pyqtgraph.patch + ]; propagatedBuildInputs = [ opencv4 @@ -79,6 +78,11 @@ buildPythonPackage rec { pyserial ]; + disabledTestPaths = [ + # Crashes python + "stytra/tests/test_z_experiments.py" + ]; + meta = with lib; { description = "A modular package to control stimulation and track behaviour"; homepage = "https://github.com/portugueslab/stytra"; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 92fe9124bf714..603acb73884b4 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.8"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lBAel9ueuyr6AFNCYk1nHRvf8KvtiszESzRIOqjBjHQ="; + hash = "sha256-dRhZWV58tHoGpJ2bDWFov1timTHYnqTPILySauutyzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index b985ebf8d8934..2bacc67690f01 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -7,13 +7,14 @@ , pandas , pytestCheckHook , pythonOlder -, setuptools-scm , setuptools +, setuptools-scm +, jpype1 }: buildPythonPackage rec { pname = "tabula-py"; - version = "2.8.1"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,28 +23,30 @@ buildPythonPackage rec { owner = "chezou"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QqTfbSwGaNRXBiAzB1fsEawxCvlIunB1j2jSFD9imPI="; + hash = "sha256-Zrq1i+HYXXNulyZ/fv00AgVd7ODj3rP9orLq5rT3ERU="; }; - patches = [ - ./java-interpreter-path.patch - ]; - postPatch = '' - sed -i 's|@JAVA@|${jre}/bin/java|g' $(find -name '*.py') + substituteInPlace tabula/backend.py \ + --replace '"java"' '"${lib.getExe jre}"' ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; + buildInputs = [ + jre + ]; + propagatedBuildInputs = [ distro numpy pandas - setuptools + jpype1 ]; nativeCheckInputs = [ @@ -60,6 +63,11 @@ buildPythonPackage rec { "test_read_pdf_with_remote_template" "test_read_remote_pdf" "test_read_remote_pdf_with_custom_user_agent" + # not sure what it checks + # probably related to jpype, but we use subprocess instead + # https://github.com/chezou/tabula-py/issues/352#issuecomment-1730791540 + # Failed: DID NOT RAISE <class 'RuntimeError'> + "test_read_pdf_with_silent_true" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch b/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch deleted file mode 100644 index fcd03628794ac..0000000000000 --- a/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru origsource/tabula/io.py source/tabula/io.py ---- origsource/tabula/io.py 2022-11-23 17:19:35.419837514 +0100 -+++ source/tabula/io.py 2022-11-23 17:22:08.204194807 +0100 -@@ -79,7 +79,7 @@ - ) - ) - -- args = ["java"] + java_options + ["-jar", _jar_path()] + options.build_option_list() -+ args = ["@JAVA@"] + java_options + ["-jar", _jar_path()] + options.build_option_list() - if path: - args.append(path) - -diff -ru origsource/tabula/util.py source/tabula/util.py ---- origsource/tabula/util.py 2022-11-23 17:19:35.422837521 +0100 -+++ source/tabula/util.py 2022-11-23 17:21:41.514132392 +0100 -@@ -26,7 +26,7 @@ - - try: - res = subprocess.check_output( -- ["java", "-version"], stderr=subprocess.STDOUT -+ ["@JAVA@", "-version"], stderr=subprocess.STDOUT - ).decode() - - except FileNotFoundError: -diff -ru origsource/tests/test_read_pdf_table.py source/tests/test_read_pdf_table.py ---- origsource/tests/test_read_pdf_table.py 2022-11-23 17:19:35.422837521 +0100 -+++ source/tests/test_read_pdf_table.py 2022-11-23 17:21:22.008086776 +0100 -@@ -281,7 +281,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8") - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ -@@ -355,7 +355,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=False) - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ -@@ -382,7 +382,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=True) - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index 806da0dc3e414..c146c7fd9bd8c 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,22 +14,22 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.3.0"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; rev = "refs/tags/v${version}"; - hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + hash = "sha256-wO6yMMU5fxk8GQ0e4ZCse2atlR4wrzulZOFXkVKAsmU="; }; postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ --replace "--cov" "" ''; @@ -38,7 +39,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro + orjson yarl ]; diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix new file mode 100644 index 0000000000000..b79cd78bf4b90 --- /dev/null +++ b/pkgs/development/python-modules/telegram-text/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "telegram-text"; + version = "0.1.2"; + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "SKY-ALIN"; + repo = "telegram-text"; + rev = "v${version}"; + hash = "sha256-p8SVQq7IvkVuOFE8VDugROLY5Wk0L2HmXyacTzFFSP4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python markup module for Telegram messenger"; + downloadPage = "https://github.com/SKY-ALIN/telegram-text"; + homepage = "https://telegram-text.alinsky.tech/"; + changelog = "https://github.com/SKY-ALIN/telegram-text/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 8e017cc55b0f2..e81e9736c26cb 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -27,17 +27,17 @@ }: let - version = "0.19.0"; - pname = "tensorflow_probability"; + version = "0.21.0"; + pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { - name = "${pname}-${version}-py2.py3-none-any.whl"; + name = "tensorflow_probability-${version}-py2.py3-none-any.whl"; src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "v" + version; - hash = "sha256-ZkQ20Qt/RF/leVP6Kc38tGgPz+C6lEuHvoL+s97oksE="; + rev = "refs/tags/v${version}"; + hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU="; }; nativeBuildInputs = [ # needed to create the output wheel in installPhase @@ -54,8 +54,7 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - # FIXME: tensorflow is currently marked as broken, update the hash once it's fixed - sha256 = "sha256-0ChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk="; + sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM="; }; buildAttrs = { @@ -117,6 +116,6 @@ in buildPythonPackage { description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; - maintainers = with maintainers; []; # This package is maintainerless. + maintainers = with maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index 0d1e44468e4ef..e148fce241635 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-yp9Wxc5RUZYhv2RxQwImZGqqoQmtZEkfEmj40ilxhQM="; + hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { description = "A modern Python REST client for Apache Tika server"; homepage = "https://github.com/stumpylog/tika-client"; changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.mpl20; maintainers = with maintainers; [ e1mo ]; }; } diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index e41158d8c1676..04c14fe5f0680 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.9.2"; + version = "23.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pg4lKRsgi4SZrKYnVmMfU5hzJriRqVa3InYW9emFLy8="; + hash = "sha256-PPB/BTZLuHmbKmUIe5gZMAwV+TUDqXBYg6fKsokTotg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiny-proxy/default.nix b/pkgs/development/python-modules/tiny-proxy/default.nix index cbb015909ec0b..9a319d90a1649 100644 --- a/pkgs/development/python-modules/tiny-proxy/default.nix +++ b/pkgs/development/python-modules/tiny-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tiny-proxy"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "tiny-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-emQRiG2QiuZt4/lI8shJOvMpaqXNyJ/PMvtDZPaoyLo="; + hash = "sha256-59T09qcOstl/yfzQmNlTNxGerQethZntwDAHwz/5FFM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 207b605070ae7..3967781bb0f8f 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2023102600"; + version = "2023110300"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-ncbgR/syMChIL0/FGLOHxHJMUzH0G+rZX9aCXun7yc4="; + hash = "sha256-rmKqY7Z4bBR4r+w4gH04g0Xm9N7QeMVcuFR3pB/pOQY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 59396d421ed93..64c8d833a3fe9 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -48,7 +48,10 @@ let inherit (lib) attrsets lists strings trivial; - inherit (cudaPackages) cudaFlags cudnn nccl; + inherit (cudaPackages) cudaFlags cudnn; + + # Some packages are not available on all platforms + nccl = cudaPackages.nccl or null; setBool = v: if v then "1" else "0"; @@ -178,6 +181,13 @@ in buildPythonPackage rec { 'message(FATAL_ERROR "Found NCCL header version and library version' \ 'message(WARNING "Found NCCL header version and library version' '' + # TODO(@connorbaker): Remove this patch after 2.1.0 lands. + + lib.optionalString cudaSupport '' + substituteInPlace torch/utils/cpp_extension.py \ + --replace \ + "'8.6', '8.9'" \ + "'8.6', '8.7', '8.9'" + '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' @@ -228,7 +238,7 @@ in buildPythonPackage rec { preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES - ${python.pythonForBuild.interpreter} setup.py build --cmake-only + ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only ${cmake}/bin/cmake build ''; @@ -253,6 +263,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; + USE_NCCL = setBool (nccl != null); USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL USE_STATIC_NCCL = setBool useSystemNccl; @@ -291,7 +302,7 @@ in buildPythonPackage rec { ]) ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; - buildInputs = [ blas blas.provider pybind11 ] + buildInputs = [ blas blas.provider ] ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # <thrust/*> @@ -316,6 +327,8 @@ in buildPythonPackage rec { libcusolver.lib libcusparse.dev libcusparse.lib + ] ++ lists.optionals (nccl != null) [ + # Some platforms do not support NCCL (i.e., Jetson) nccl.dev # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ cuda_nvprof.dev # <cuda_profiler_api.h> @@ -342,17 +355,15 @@ in buildPythonPackage rec { # the following are required for tensorboard support pillow six future tensorboard protobuf + + # ROCm build and `torch.compile` requires openai-triton + openai-triton + + # torch/csrc requires `pybind11` at runtime + pybind11 ] ++ lib.optionals MPISupport [ mpi ] - ++ lib.optionals rocmSupport [ rocmtoolkit_joined ] - # rocm build requires openai-triton; - # openai-triton currently requires cuda_nvcc, - # so not including it in the cpu-only build; - # torch.compile relies on openai-triton, - # so we include it for the cuda build as well - ++ lib.optionals (rocmSupport || cudaSupport) [ - openai-triton - ]; + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; # Tests take a long time and may be flaky, so just sanity-check imports doCheck = false; diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index 6cc7bcf3e27c9..59b7e99c9dfca 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { "test_flan_t5_small" # AssertionError in output "test_google" + # "addmm_impl_cpu_" not implemented for 'Half' + "test_input_size_half_precision" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 85e85c16afc79..ee66ee817d1f7 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -14,6 +14,8 @@ , pytestCheckHook , torchmetrics , pytorch-lightning +, pytest-doctestplus +, pytest-xdist }: let @@ -22,10 +24,11 @@ let in buildPythonPackage { inherit pname version; + pyproject = true; src = fetchFromGitHub { - owner = "PyTorchLightning"; - repo = "metrics"; + owner = "Lightning-AI"; + repo = "torchmetrics"; rev = "refs/tags/v${version}"; hash = "sha256-g5JuTbiRd8yWx2nM3UE8ejOhuZ0XpAQdS5AC9AlrSFY="; }; @@ -51,22 +54,33 @@ buildPythonPackage { cloudpickle psutil pytestCheckHook + pytest-doctestplus + pytest-xdist ]; # A cyclic dependency in: integrations/test_lightning.py doCheck = false; passthru.tests.check = torchmetrics.overridePythonAttrs (_: { + pname = "${pname}-check"; doCheck = true; + # We don't have to install because the only purpose + # of this passthru test is to, well, test. + # This fixes having to set `catchConflicts` to false. + dontInstall = true; }); + disabledTests = [ + # `IndexError: list index out of range` + "test_metric_lightning_log" + ]; + disabledTestPaths = [ # These require too many "leftpad-level" dependencies - "tests/text" - "tests/audio" - "tests/image" + # Also too cross-dependent + "tests/unittests" - # A few non-deterministic things like test_check_compute_groups_is_faster - "tests/bases/test_collections.py" + # A trillion import path mismatch errors + "src/torchmetrics" ]; pythonImportsCheck = [ @@ -75,11 +89,10 @@ buildPythonPackage { meta = with lib; { description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)"; - homepage = "https://torchmetrics.readthedocs.io"; + homepage = "https://lightning.ai/docs/torchmetrics/"; license = licenses.asl20; maintainers = with maintainers; [ SomeoneSerge ]; }; } - diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix new file mode 100644 index 0000000000000..2e946229747f1 --- /dev/null +++ b/pkgs/development/python-modules/torrent-parser/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "torrent-parser"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "7sDream"; + repo = "torrent_parser"; + rev = "v${version}"; + hash = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "torrent_parser" + ]; + + meta = { + description = "A .torrent file parser and creator for both Python 2 and 3"; + homepage = "https://github.com/7sDream/torrent_parser"; + changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/torrent_parser/default.nix b/pkgs/development/python-modules/torrent_parser/default.nix deleted file mode 100644 index f60300086f2a4..0000000000000 --- a/pkgs/development/python-modules/torrent_parser/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage, lib, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "torrent_parser"; - version = "0.4.1"; - - # No tarballs on Pypi - src = fetchFromGitHub { - owner = "7sDream"; - repo = "torrent_parser"; - rev = "v${version}"; - sha256 = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; - }; - - meta = { - description = "A .torrent file parser and creator for both Python 2 and 3"; - homepage = "https://github.com/7sDream/torrent_parser"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 2b8d597ae67f7..3c4fda87976fb 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.34.1"; + version = "4.35.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-ZyRn1AyyKvtrUUSWZ95jfIMXydcCSM5zZeseF7golhU="; + hash = "sha256-f66Y6kcAm//Z2UyCl/iEBDP+6nm3QJ5EtwpAnBn4gbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index afd09159424d8..adc2718554acf 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.8"; + version = "0.19.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-otU0twF8NHbuaaRL2K6vO1iMQrqoMiRz0QCkXuZ1ENc="; + hash = "sha256-vVno8ql7e9N0Xj+GALDtgAZBRrN1NxVcUIJuKNJIZDA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix new file mode 100644 index 0000000000000..a85be00ddf799 --- /dev/null +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, numpy +, python-dateutil +, xxhash +, pytestCheckHook +, requests +, xdoctest +}: + +buildPythonPackage rec { + pname = "ubelt"; + version = "1.3.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "ubelt"; + rev = "refs/tags/v${version}"; + hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + passthru.optional-dependencies = { + optional = [ + numpy + python-dateutil + xxhash + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + requests + xdoctest + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = lib.optionals stdenv.isDarwin [ + # fail due to sandbox environment + "CacheStamp.expired" + "userhome" + ]; + + pythonImportsCheck = [ "ubelt" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Python utility library with a stdlib like feel and extra batteries. Paths, Progress, Dicts, Downloads, Caching, Hashing: ubelt makes it easy"; + homepage = "https://github.com/Erotemic/ubelt"; + changelog = "https://github.com/Erotemic/ubelt/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 77c4b099687de..95b765bd3e602 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.8.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-isngr9CZ2YYuq+5s3p4HXrTU20vPqZGZ1r8mBoVkxiI="; + hash = "sha256-r9uxPXpmQSsL1rX4d9TH87olFbZugdGdNG++Ygjie1I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 04d3bd6fd9f4b..4083810195a9c 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.3"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,40 +25,9 @@ buildPythonPackage rec { owner = "lmcinnes"; repo = "umap"; rev = version; - hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; + hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A="; }; - patches = [ - # Fix tests with sklearn>=1.2.0 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch"; - hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch"; - hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch"; - hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0="; - }) - # Fix tests with numpy>=1.24 - # https://github.com/lmcinnes/umap/pull/952 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch"; - hash = "sha256-B50eyMs3CRuzOAq+jxz56XMJPdiUofUxCL0Vqolaafo="; - }) - # https://github.com/lmcinnes/umap/pull/1010 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/848396c762c894e666aaf3d0bcfe1e041b529ea6.patch"; - hash = "sha256-ir0Pxfr2c0oSuFGXQqHjkj7nzvlpTXCYbaI9qAiLun0="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/30e39938f4627f327223245dfe2c908af6b7e304.patch"; - hash = "sha256-7Divrym05wIPa7evgrNYXGm44/EOWG8sIYV8fmtuzJ4="; - }) - ]; - propagatedBuildInputs = [ numba numpy diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index f1dc4418b2681..70446323f1d9b 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -85,5 +85,6 @@ buildPythonPackage rec { changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ loewenheim ]; + mainProgram = "vdirsyncer"; }; } diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 29439bb2a2d1d..23b41404034f9 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.2"; + version = "1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-7r2FFfWGqjE3Z7wsdf6KwwbUZ+wXqOscsL/2CepSMLY="; + hash = "sha256-OrRR5wLTq3icSBq+9m+MxIvkTvJP7yiGR9yzPt53q+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index cc5fa6c5a9a03..8fe5ba39ed518 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,20 +24,20 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.1.1"; + version = "5.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IR/wzXBZ+Win/EOFUDsg2AHB5otW9YMeCmpPxgCllD8="; + hash = "sha256-RfrHlOTCDH51sBgGnX+XYfJfqjYZ7zDfJAE8okq/mnQ="; }; postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "Pillow>=4.0.0,<10.0.0" "Pillow>=9.1.0,<11.0.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 1304b6c1dd79f..1bc512398bd05 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -63,6 +63,11 @@ buildPythonPackage rec { "wfuzz" ]; + postInstall = '' + mkdir -p $out/share/wordlists/wfuzz + cp -R -T "wordlist" "$out/share/wordlists/wfuzz" + ''; + meta = with lib; { description = "Web content fuzzer to facilitate web applications assessments"; longDescription = '' diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix index b65f18b6c6ec0..b7af5aeeb652e 100644 --- a/pkgs/development/python-modules/wikitextparser/default.nix +++ b/pkgs/development/python-modules/wikitextparser/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.54.0"; + version = "0.55.5"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-AGQfjUNxeleuTS200QMdZS8CSD2t4ah5NMm9TIYjVHk="; + hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix index 0ed40b8a91731..5cbab3005120d 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxPython/4.2.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { export PATH="${wxGTK}/bin:$PATH" export SDL_CONFIG="${SDL.dev}/bin/sdl-config" - ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py + ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py runHook postBuild ''; @@ -111,7 +111,7 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonOnBuildForHost.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms runHook postInstall diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 189042082f042..c57f5a4da52cf 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; postBuild = '' - ${python.pythonForBuild.interpreter} -m compileall -f xattr + ${python.pythonOnBuildForHost.interpreter} -m compileall -f xattr ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix new file mode 100644 index 0000000000000..357e605d85349 --- /dev/null +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xdoctest"; + version = "1.1.2"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "xdoctest"; + rev = "refs/tags/v${version}"; + hash = "sha256-yTu5ldr9TkpYRP8hjgUPpexBVLjaK2gfPvISjMJLY74="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + export PATH=$out/bin:$PATH + ''; + + pythonImportsCheck = [ "xdoctest" ]; + + meta = with lib; { + description = "A rewrite of Python's builtin doctest module (with pytest plugin integration) with AST instead of REGEX"; + homepage = "https://github.com/Erotemic/xdoctest"; + changelog = "https://github.com/Erotemic/xdoctest/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "xdoctest"; + }; +} diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index 0b8f8d4ceb5a7..35556fe32d9c7 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} xkbcommon/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} xkbcommon/ffi_build.py ''; pythonImportsCheck = [ "xkbcommon" ]; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 4610e71876e6a..0d11e9df8c1be 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KTXVS0gtGby1Rla9oBy77J7kH/1C0jWlJwX9lcq3D9c="; + hash = "sha256-zEgC3tTQ6kwDovHPHRTvYndWVF79DpnAX454VDZiedE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix new file mode 100644 index 0000000000000..21d6e7e790ed6 --- /dev/null +++ b/pkgs/development/python-modules/zcbor/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build dependencies +, setuptools + +# dependencies +, cbor2 +, pyyaml +, regex +}: + +buildPythonPackage rec { + pname = "zcbor"; + version = "0.7.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0mGp7Hnq8ZNEUx/9eQ6UD9/cOuLl6S5Aif1qNh1+jYA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cbor2 + pyyaml + regex + ]; + + pythonImportsCheck = [ "zcbor" ]; + + meta = with lib; { + description = "A low footprint CBOR library in the C language (C++ compatible), tailored for use in microcontrollers"; + homepage = "https://pypi.org/project/zcbor/"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/python2-modules/bootstrapped-pip/default.nix index 314bf0048c8a6..846c76b677b3b 100644 --- a/pkgs/development/python2-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python2-modules/bootstrapped-pip/default.nix @@ -45,17 +45,17 @@ stdenv.mkDerivation rec { echo "Building setuptools wheel..." pushd setuptools - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building wheel wheel..." pushd wheel - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building pip wheel..." pushd pip - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd ''; diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix index eefc69a3323f6..f90031e048fbb 100644 --- a/pkgs/development/python2-modules/pycairo/default.nix +++ b/pkgs/development/python2-modules/pycairo/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; meta = with lib; { diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/python2-modules/setuptools/default.nix index ca70a10615123..faddafc9f9d37 100644 --- a/pkgs/development/python2-modules/setuptools/default.nix +++ b/pkgs/development/python2-modules/setuptools/default.nix @@ -29,8 +29,8 @@ let ]; buildPhase = '' - ${python.pythonForBuild.interpreter} bootstrap.py - ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar + ${python.pythonOnBuildForHost.interpreter} bootstrap.py + ${python.pythonOnBuildForHost.interpreter} setup.py sdist --formats=gztar # Here we untar the sdist and retar it in order to control the timestamps # of all the files included diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 95043c7be4821..39400d5b4bc65 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -25,6 +25,7 @@ , quickemu , testers , installShellFiles +, fetchpatch }: let runtimePaths = [ @@ -50,15 +51,23 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-QchY9inmBqAwNEhUL+uFCRX1laaM57ICbDJEBW7qTic="; + hash = "sha256-ZCHGZb4mdtnNfFBcSqZJRW7fmkTBrWrVko3iwEhO1RY="; }; + patches = [ + # https://github.com/quickemu-project/quickemu/pull/815 + (fetchpatch { + url = "https://github.com/quickemu-project/quickemu/commit/2b9d95a746fd85be0cea48e5544b18dc3ae18d27.patch"; + hash = "sha256-fTJEd3o7LznT1mGwfxXWlW8XM1BmIeId+j8pGjIfIcE="; + }) + ]; + postPatch = '' sed -i \ -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ff9e3b1968cfa..cd814e4b41452 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -334,6 +334,13 @@ in ''; }; + google-protobuf = attrs: + lib.optionalAttrs (lib.versionAtLeast attrs.version "3.25.0") { + # Fails on 3.25.0 with: + # convert.c:312:32: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + hardeningDisable = [ "format" ]; + }; + grpc = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 3ae9b7ce8aac2..24a1465e690a7 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -5,7 +5,7 @@ # : string , version # : string -, sha256 +, sha256 ? lib.fakeSha256 # : string , description # : list Platform diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix index afded05e0c08f..798ae11df5cbb 100644 --- a/pkgs/development/skaware-packages/default.nix +++ b/pkgs/development/skaware-packages/default.nix @@ -8,17 +8,22 @@ lib.makeScope pkgs.newScope (self: buildPackage = callPackage ./build-skaware-package.nix { }; cleanPackaging = callPackage ./clean-packaging.nix { }; + # execline execline = callPackage ./execline { }; execline-man-pages = callPackage ./execline-man-pages { }; + # servers & tools mdevd = callPackage ./mdevd { }; nsss = callPackage ./nsss { }; - sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + tipidee = callPackage ./tipidee { }; utmps = callPackage ./utmps { }; + # libs skalibs = callPackage ./skalibs { }; skalibs_2_10 = callPackage ./skalibs/2_10.nix { }; + sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + # s6 tooling s6 = callPackage ./s6 { }; s6-dns = callPackage ./s6-dns { }; s6-linux-init = callPackage ./s6-linux-init { }; diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index c57db9240155d..caa9a8030a94e 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -2,7 +2,7 @@ with skawarePackages; let - version = "2.9.3.0"; + version = "2.9.4.0"; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -19,7 +19,7 @@ in buildPackage { inherit version; pname = "execline"; - sha256 = "yAJ/pwki0RfN7ozCDSd+ONA/2WDm0TbYzsMmA9TsI40="; + sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/development/skaware-packages/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix index 3762e4a16d945..9f4caa4ed0256 100644 --- a/pkgs/development/skaware-packages/mdevd/default.nix +++ b/pkgs/development/skaware-packages/mdevd/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "mdevd"; - version = "0.1.6.2"; - sha256 = "rC/PkATweQRZLFiU4sQB4VuwJ+zze8uOpmHip5k0R74="; + version = "0.1.6.3"; + sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA="; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix index 1533da89bcbe0..3f81c0e66b3fc 100644 --- a/pkgs/development/skaware-packages/nsss/default.nix +++ b/pkgs/development/skaware-packages/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.2.0.3"; - sha256 = "seOX7VsydhGnwsjB3GDpH+81PFT+rUZPiHcgvAkUFI4="; + version = "0.2.0.4"; + sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0="; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index a4f018621f119..d5ece13451c5b 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.5"; - sha256 = "VpebXVElw4BxqAtePfDUprKnxSu4Y6JBC249eX/+Hug="; + version = "2.3.6.0"; + sha256 = "AefHUyzF56a4kVRhsBwvcGt/IhF4KSPiXqpU7gxtx8c="; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index f95e2343cb14a..a60216559286b 100644 --- a/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-init"; - version = "1.1.1.0"; - sha256 = "rUg/NTJleQB+Wn48ufH9EXfq9x7FwRxHzXhKBClWqO4="; + version = "1.1.2.0"; + sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38="; description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix index f6eba321c1989..9a6871b9f487c 100644 --- a/pkgs/development/skaware-packages/s6-linux-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.6.1.2"; - sha256 = "2GPcXXgt535GUEFFGI+1fbsLZiUGF6Z9NB6wy0qdnNk="; + version = "2.6.2.0"; + sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c="; description = "A set of minimalistic Linux-specific system utilities"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index e8367dd19cda5..9cddabb58591a 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.5.1.3"; - sha256 = "oJ5DyVn/ngyqj/QAJgjnPA9X+H8EqNnCTmya/v5F6Xc="; + version = "2.6.0.0"; + sha256 = "MdHWj7BdY5zr6VFLui9npU5YAfJsDRYvh1XNSxYuGLA="; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix index 759731bfe1b1b..b02628ad806e1 100644 --- a/pkgs/development/skaware-packages/s6-portable-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-portable-utils"; - version = "2.3.0.2"; - sha256 = "hxQmkTTwEmUNqsBA5WRjct6lZYucDYmnygO7Kr7E0eg="; + version = "2.3.0.3"; + sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8="; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index 442e29dac17d4..586f04ddff942 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.4.1"; - sha256 = "1yaMq3xUIzBc+VmKM9T82rijFZUrPsgPechbjLdhWPY="; + version = "0.5.4.2"; + sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI="; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index 35d90086ad16d..8a1b3aa87a6a0 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.11.3.2"; - sha256 = "fBYTitLw/74O0q6N0M7K2p98eH7dM6aQhNIZEQaT33Q="; + version = "2.12.0.0"; + sha256 = "sha256-mBjDqeIYGSQGJw9B00K+23oZ8Z3gBbqzxitACTAz72w="; description = "skarnet.org's small & secure supervision software suite"; @@ -35,7 +35,6 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6.* rm ./libs6auto.a.xyzzy - rm ./libs6lockd.a.xyzzy mv doc $doc/share/doc/s6/html mv examples $doc/share/doc/s6/examples diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 3123b8c427610..80db4b6248269 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -1,11 +1,15 @@ -{ skawarePackages, pkgs }: +{ lib +, stdenv +, skawarePackages +, pkgs +}: with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.13.1.1"; - sha256 = "snKhq3mff6xEubT7Ws54qWFrL+SIIVl1S4CIxNgZnjM="; + version = "2.14.0.0"; + sha256 = "p0X9NM+EvsdDmO/6G29MOcVXNnM5ObEmA45SstXcwdI="; description = "A set of general-purpose C programming libraries"; @@ -21,6 +25,17 @@ buildPackage { # Empty the default path, which would be "/usr/bin:bin". # It would be set when PATH is empty. This hurts hermeticity. "--with-default-path=" + + ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ + # ./configure: sysdep posixspawnearlyreturn cannot be autodetected + # when cross-compiling. Please manually provide a value with the + # --with-sysdep-posixspawnearlyreturn=yes|no|... option. + # + # posixspawnearlyreturn: `yes` if the target has a broken + # `posix_spawn()` implementation that can return before the + # child has successfully exec'ed. That happens with old glibcs + # and some virtual platforms. + "--with-sysdep-posixspawnearlyreturn=no" ]; postInstall = '' diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix new file mode 100644 index 0000000000000..6b44516615a07 --- /dev/null +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -0,0 +1,40 @@ +{ skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "tipidee"; + version = "0.0.1.0"; + sha256 = "sha256-rKi9IX9CcRhY4n44i2vDom9MIeuGxRAHF7u0C3nNvFU="; + + description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; + + outputs = [ "bin" "lib" "out" "dev" "doc" ]; + + configureFlags = [ + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + + # we set sysconfdir to /etc here to allow tipidee-config + # to look in the global paths for its configs. + # This is not encouraged, but a valid use-case. + "--sysconfdir=/etc" + ]; + + postInstall = '' + # remove all tipidee executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libtipidee.* + + mv doc $doc/share/doc/tipidee/html + mv examples $doc/share/doc/tipidee/examples + ''; + +} diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix index 7e0958593937d..406635e061685 100644 --- a/pkgs/development/skaware-packages/utmps/default.nix +++ b/pkgs/development/skaware-packages/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.2.1"; - sha256 = "BCPfx0vxOQ5G4uDCECIbsgX8247yMn5x7QhQd3xdyb0="; + version = "0.1.2.2"; + sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I="; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 34bb4303724b0..1e45079aa7834 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -3,33 +3,16 @@ , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "2.7.1"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "2.5.15"; - format = "setuptools"; + version = "3.0.32"; + pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; - repo = pname; + repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-PVx66Ipvf+rISkuu9dw2ecFXXmuzITg2PogqRktFh5M="; + hash = "sha256-YOZ7F/bxbnBh3mhiFL3cMMAc3qeOMab48LcvYeJgfrg="; }; patches = [ @@ -45,12 +28,12 @@ buildPythonApplication rec { "pycep-parser" ]; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aiodns aiohttp aiomultiprocess @@ -82,6 +65,7 @@ buildPythonApplication rec { prettytable pycep-parser pyyaml + pydantic rustworkx semantic-version spdx-tools @@ -92,7 +76,7 @@ buildPythonApplication rec { update_checker ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ aioresponses mock pytest-asyncio @@ -119,12 +103,10 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.205 - "test_non_multiline_pair" - "test_secret_value_in_keyword" - "test_runner_verify_secrets_skip_invalid_suppressed" - "test_runner_verify_secrets_skip_all_no_effect" + # Assertion error "test_runner" + # AssertionError: assert ['<?xml versi... + "test_get_cyclonedx_report" ]; disabledTestPaths = [ @@ -144,6 +126,8 @@ buildPythonApplication rec { "tests/kubernetes/" "tests/sca_package_2" "tests/terraform/" + "cdk_integration_tests/" + "sast_integration_tests" # Performance tests have no value for us "performance_tests/test_checkov_performance.py" # No Helm diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index 39124514d042d..eaa87d573f8c9 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ atalii ]; platforms = lib.platforms.unix; + mainProgram = "alr"; }; }) diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index c3be1a4bc5350..92593bb60e5fe 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; broken = stdenv.isDarwin; # typical `ar failure` + mainProgram = "muon"; }; }) # TODO LIST: diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 6d8222e387e42..01fc3b3aafb7b 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.3"; + version = "2.8.5"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-BC6RazVbT1sr4RLQ1ZR4hHZGXDqFSvuqpt5vPyMDylA="; + hash = "sha256-GcZ747z8valsqHoY7/rDm/zMRD+7N1THu8AVEd7NJK8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 0f09d28140686..b768021035cbf 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-v46Yfj0gRT84R1vttKkpan28dkeJWHNgzKzI+ZVCiNc="; + hash = "sha256-t4//83DD3hCnxsuuw7nB06SWCY4/GcRcIk8Cr3C4bDw="; }; - vendorHash = "sha256-KZ2nAd+5D5PFgSDhNeHg6Hnp+h7HqZ2CRsKUek0KZhM="; + vendorHash = "sha256-42CrWLwBcv2GE+hEgJJOd7hFQu7rjYrXkPhhUykqIQw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 7f3d667efda21..56c3a72ea7f14 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.15.5"; + version = "1.15.6"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-DrrIh2ThayFUqnUGGHkX0WmVkzitnVEOMXS8yWydD0A="; + sha256 = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg="; }; dontUnpack = true; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index d14486f8aeda2..4195a8453033f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -24,7 +24,7 @@ , moto , markdown , lz4 -, setuptoolsTrial +, setuptools-trial , buildbot-worker , buildbot-plugins , buildbot-pkg @@ -103,7 +103,7 @@ let moto markdown lz4 - setuptoolsTrial + setuptools-trial buildbot-worker buildbot-pkg buildbot-plugins.www diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 5f3c0efab417c..29d0bcf7fb739 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -15,7 +15,7 @@ # tests , parameterized , psutil -, setuptoolsTrial +, setuptools-trial # passthru , nixosTests @@ -36,7 +36,7 @@ buildPythonPackage (rec { ''; nativeBuildInputs = [ - setuptoolsTrial + setuptools-trial ]; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 4caf0cae4a56b..9189c59638246 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.55.0"; + version = "3.59.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-HvpEEutvdVHyzDtHdlc7ZB9xwnCKYWKbH/A1gAtR+Wk="; + sha256 = "sha256-pYaxjXoNn6MOE2oHUSKrBzP5oKhtfJwSHFCkcpkyzas="; }; - vendorHash = "sha256-bIOS9Ja+mue6LNXUGmkLobh+lLiJfBDtNrAX3fp0jMY="; + vendorHash = "sha256-JSuam9Tn+ZekfLrj78tBncH7Q2aP4CaUgaaDkJ/azEw="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 2495e09bba51c..8ac28618b4223 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NX2687jG0TAt3rOV5XEmgHYiNhuBoWbnUEFnf3w5k6A="; + sha256 = "sha256-KJBg64GaWXUV6go8IO9cI82NUeD0j59ySZTTzINo8So="; }; - vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw="; + vendorHash = "sha256-u3UtrsHohuQrSk4ypMXasLPYwkcRYMvOdpBpO8PpwZg="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 67d905ae0565c..cc68d8b93bbe8 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,37 +1,11 @@ -{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }: +{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; version = "23.2.0.178.1027"; - src = requireFile rec { - url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "sqlcl-${version}.zip"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the - download and repeat until the version is correct. This is necessary - because as the time of this writing there exists no permanent link - for the current version yet. - Also consider updating this package yourself (you probably just need - to change the `version` variable and update the sha256 to the one of - the new file) or opening an issue at the nixpkgs repo. - - click "Download" - - sign in or create an oracle account if neccessary - - on the next page, click the "${name}" link - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; + src = fetchurl { + url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; @@ -58,8 +32,8 @@ stdenv.mkDerivation rec { also supporting your previously written SQL*Plus scripts. ''; homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; - license = licenses.unfree; + license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ misterio77 ]; }; -} +}) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index da7b0d662b32a..88fc8f6e4f0ba 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -5,6 +5,7 @@ , buildPythonApplication , python3 , pythonRelaxDepsHook +, installShellFiles , androguard , babel , clint @@ -26,14 +27,14 @@ buildPythonApplication rec { pname = "fdroidserver"; - version = "2.2.1"; + version = "unstable-2023-10-23"; format = "setuptools"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "refs/tags/${version}"; - sha256 = "sha256-+Y1YTgELsX834WIrhx/NX34yLMHdkKM+YUNvnHPiC/s="; + rev = "f4b10cf83935432d19948dac669964384bef0728"; + hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; }; pythonRelaxDeps = [ @@ -47,16 +48,19 @@ buildPythonApplication rec { ''; preConfigure = '' - ${python3.pythonForBuild.interpreter} setup.py compile_catalog + ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog ''; postInstall = '' patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin + installShellCompletion --cmd fdroid \ + --bash completion/bash-completion ''; nativeBuildInputs = [ pythonRelaxDepsHook + installShellFiles ]; buildInputs = [ diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index d7c4e27b0e7f3..a0ba21d606744 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -43,8 +43,12 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp $src/* $out/bin + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix index 9af1c4d8ee074..05589b5c9747b 100644 --- a/pkgs/development/tools/fx/default.nix +++ b/pkgs/development/tools/fx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fx"; - version = "30.2.0"; + version = "31.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-1U3XaqRJpwC41R8hiF7vQ32DOTGGxhaU1ZWiXzys8/M="; + hash = "sha256-AVaMViu+65xyYW3TzIigNXf5FfKb2v+TU/BMZqCX/Js="; }; - vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw="; + vendorHash = "sha256-kE6JotKP3YQ0B3HvyNU3fTvuwbnqTW8cwGVBYpiBvso="; meta = with lib; { description = "Terminal JSON viewer"; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 986d2d7745f39..b7dc3b04ac5a1 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.1.1"; - commitHash = "bd6af8e0ea69167dd0627f3bd54f9105bda0f8b5"; + version = "4.1.3-stable"; + commitHash = "fc79201851a16215f9554884aa242ed957801b10"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-0CErsMTrBC/zYcabAtjYn8BWAZ1HxgozKdgiqdsn3q8="; + hash = "sha256-z5JRPhdEO20AodS12MApgur0BMHGToUjo2r2eI77nNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 73bf606aa7aa4..26f2aeae13bec 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.55.1"; + version = "1.55.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-r4tPFHvxXMgyGc5KTz0fM5nZ20OVSPQ6kKnTkeaefPI="; + hash = "sha256-DO71wfDmCuziEcsme1g1uNIl3MswA+EkQcYzOYHbG+I="; }; - vendorHash = "sha256-NfSO3JUrFJi1lwxhy+eubNNKuhgLTfDt2KLAnmOjdoA="; + vendorHash = "sha256-0+jImfMdVocOczGWeO03YXUg5yKYTu3WeJaokSlcYFM="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/haskell/hadrian/ghc-platform.nix b/pkgs/development/tools/haskell/hadrian/ghc-platform.nix new file mode 100644 index 0000000000000..3b1b17fba2c7b --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/ghc-platform.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, lib + # GHC source tree to build ghc-toolchain from +, ghcSrc +, ghcVersion +}: +mkDerivation { + pname = "ghc-platform"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/libraries/ghc-platform" + ''; + libraryHaskellDepends = [ base ]; + description = "Platform information used by GHC and friends"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix b/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix new file mode 100644 index 0000000000000..035fee7aca806 --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix @@ -0,0 +1,19 @@ +{ mkDerivation, base, directory, filepath, ghc-platform, lib +, process, text, transformers + # GHC source tree to build ghc-toolchain from +, ghcVersion +, ghcSrc +}: +mkDerivation { + pname = "ghc-toolchain"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/utils/ghc-toolchain" + ''; + libraryHaskellDepends = [ + base directory filepath ghc-platform process text transformers + ]; + description = "Utility for managing GHC target toolchains"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/hadrian/default.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix index 1801d63cf8b99..1be21d6f45196 100644 --- a/pkgs/development/tools/haskell/hadrian/default.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -1,20 +1,19 @@ -{ # GHC source tree to build hadrian from - ghcSrc ? null, ghcVersion ? null -, mkDerivation, base, bytestring, Cabal, containers, directory +# See also ./make-hadria.nix +{ mkDerivation, base, bytestring, Cabal, containers, directory , extra, filepath, lib, mtl, parsec, shake, text, transformers , unordered-containers, cryptohash-sha256, base16-bytestring -, userSettings ? null -# Whether to pass --hyperlinked-source to haddock or not. This is a custom -# workaround as we wait for this to be configurable via userSettings or similar. -# https://gitlab.haskell.org/ghc/ghc/-/issues/23625 -, enableHyperlinkedSource ? true , writeText + # Dependencies that are not on Hackage and only used in certain Hadrian versions +, ghc-platform ? null +, ghc-toolchain ? null + # GHC source tree to build hadrian from +, ghcSrc +, ghcVersion + # Customization +, userSettings ? null +, enableHyperlinkedSource }: -if ghcSrc == null || ghcVersion == null -then throw "hadrian: need to specify ghcSrc and ghcVersion arguments manually" -else - mkDerivation { pname = "hadrian"; version = ghcVersion; @@ -44,7 +43,13 @@ mkDerivation { parsec shake text transformers unordered-containers ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [ cryptohash-sha256 base16-bytestring + ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [ + ghc-platform ghc-toolchain ]; + passthru = { + # Expose »private« dependencies if any + inherit ghc-platform ghc-toolchain; + }; description = "GHC build system"; license = lib.licenses.bsd3; } diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix new file mode 100644 index 0000000000000..6aa30cb9e60c3 --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -0,0 +1,59 @@ +# Hadrian is the build system used to (exclusively) build GHC. It can +# (theoretically) be used starting with GHC 9.4 and is required since 9.6. It is +# developed in the GHC source tree and specific to the GHC version it is released +# with, i.e. Hadrian always needs to be built from the same GHC source tree as +# the GHC we want to build. +# +# This fact makes it impossible to integrate Hadrian into our Haskell package +# sets which are also used to bootstrap GHC, since a package set can bootstrap +# multiple GHC versions (usually two major versions). A bootstrap set would need +# knowledge of the GHC it would eventually bootstrap which would make the logic +# unnecessarily complicated. +# +# Luckily Hadrian is, while annoying to bootstrap, relatively simple. Specifically +# all it requires to build is (relative to the GHC we are trying to build) a +# build->build GHC and build->build Haskell packages. We can get all of this +# from bootPkgs which is already passed to the GHC expression. +# +# The solution is the following: The GHC expression passes its source tree and +# version along with some parameters to this function (./make-hadrian.nix) +# which acts as a common expression builder for all Hadrian version as well as +# related packages that are managed in the GHC source tree. Its main job is to +# expose all possible compile time customization in a common interface and +# take care of all differences between Hadrian versions. +{ bootPkgs +, lib +}: + +{ # GHC source tree and version to build hadrian & friends from. + # These are passed on to the actual package expressions. + ghcSrc +, ghcVersion + # Contents of a non-default UserSettings.hs to use when building hadrian, if any. + # Should be a string or null. +, userSettings ? null + # Whether to pass --hyperlinked-source to haddock or not. This is a custom + # workaround as we wait for this to be configurable via userSettings or similar. + # https://gitlab.haskell.org/ghc/ghc/-/issues/23625 +, enableHyperlinkedSource ? false +}: + +let + callPackage' = f: args: bootPkgs.callPackage f ({ + inherit ghcSrc ghcVersion; + } // args); + + ghc-platform = callPackage' ./ghc-platform.nix { }; + ghc-toolchain = callPackage' ./ghc-toolchain.nix { + inherit ghc-platform; + }; +in + +callPackage' ./hadrian.nix ({ + inherit userSettings enableHyperlinkedSource; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { + # Starting with GHC 9.9 development, additional in tree packages are required + # to build hadrian. (Hackage-released conditional dependencies are handled + # in ./hadrian.nix without requiring intervention here.) + inherit ghc-platform ghc-toolchain; +}) diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index a6f287c37b3f5..59a1303764bac 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,10 +1,77 @@ { lib , stdenv -, supportedGhcVersions ? [ "94" ] -, dynamic ? true , haskellPackages , haskell + +# Which GHC versions this hls can support. +# These are looked up in nixpkgs as `pkgs.haskell.packages."ghc${version}`. +# Run +# $ nix-instantiate --eval -E 'with import <nixpkgs> {}; builtins.attrNames pkgs.haskell.packages' +# to list for your nixpkgs version. +, supportedGhcVersions ? [ "94" ] + +# Whether to build hls with the dynamic run-time system. +# See https://haskell-language-server.readthedocs.io/en/latest/troubleshooting.html#static-binaries for more information. +, dynamic ? true + +# Which formatters are supported. Pass `[]` to remove all formatters. +# +# Maintainers: if a new formatter is added, add it here and down in knownFormatters +, supportedFormatters ? [ "ormolu" "fourmolu" "floskell" "stylish-haskell" ] }: + +# make sure the user only sets GHC versions that actually exist +assert supportedGhcVersions != []; +assert + lib.asserts.assertEachOneOf + "supportedGhcVersions" + supportedGhcVersions + (lib.pipe haskell.packages [ + lib.attrNames + (lib.filter (lib.hasPrefix "ghc")) + (map (lib.removePrefix "ghc")) + ]); + +let + # A mapping from formatter name to + # - cabal flag to disable + # - formatter-specific packages that can be stripped from the build of hls if it is disabled + knownFormatters = { + ormolu = { + cabalFlag = "ormolu"; + packages = [ + "hls-ormolu-plugin" + ]; + }; + fourmolu = { + cabalFlag = "fourmolu"; + packages = [ + "hls-fourmolu-plugin" + ]; + }; + floskell = { + cabalFlag = "floskell"; + packages = [ + "hls-floskell-plugin" + ]; + }; + stylish-haskell = { + cabalFlag = "stylishhaskell"; + packages = [ + "hls-stylish-haskell-plugin" + ]; + }; + }; + +in + +# make sure any formatter that is set is actually supported by us +assert + lib.asserts.assertEachOneOf + "supportedFormatters" + supportedFormatters + (lib.attrNames knownFormatters); + # # The recommended way to override this package is # @@ -13,9 +80,43 @@ # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # let - inherit (lib) concatStringsSep concatMapStringsSep take splitString pipe optionals; - inherit (haskell.lib.compose) justStaticExecutables overrideCabal enableCabalFlag disableCabalFlag; + inherit (haskell.lib.compose) + justStaticExecutables + overrideCabal + enableCabalFlag + disableCabalFlag + ; + getPackages = version: haskell.packages."ghc${version}"; + + # Given the list of `supportedFormatters`, remove every formatter that we know of (knownFormatters) + # by disabling the cabal flag and also removing the formatter libraries. + removeUnnecessaryFormatters = + let + # only formatters that were not requested + unwanted = lib.pipe knownFormatters [ + (lib.filterAttrs (fmt: _: ! (lib.elem fmt supportedFormatters))) + lib.attrsToList + ]; + # all flags to disable + flags = map (fmt: fmt.value.cabalFlag) unwanted; + # all dependencies to remove from hls + deps = lib.concatMap (fmt: fmt.value.packages) unwanted; + + # remove nulls from a list + stripNulls = lib.filter (x: x != null); + + # remove all unwanted dependencies of formatters we don’t want + stripDeps = overrideCabal (drv: { + libraryHaskellDepends = lib.pipe (drv.libraryHaskellDepends or []) [ + # the existing list may contain nulls, so let’s strip them first + stripNulls + (lib.filter (dep: ! (lib.elem dep.pname deps))) + ]; + }); + + in drv: lib.pipe drv ([stripDeps] ++ map disableCabalFlag flags); + tunedHls = hsPkgs: lib.pipe hsPkgs.haskell-language-server ([ (haskell.lib.compose.overrideCabal (old: { @@ -27,32 +128,39 @@ let ''; })) ((if dynamic then enableCabalFlag else disableCabalFlag) "dynamic") - ] ++ optionals (!dynamic) [ + removeUnnecessaryFormatters + ] + ++ lib.optionals (!dynamic) [ justStaticExecutables ]); + targets = version: let packages = getPackages version; - in [ - "haskell-language-server-${packages.ghc.version}" - ]; + in [ "haskell-language-server-${packages.ghc.version}" ]; + makeSymlinks = version: - concatMapStringsSep "\n" (x: - "ln -s ${ - tunedHls (getPackages version) - }/bin/haskell-language-server $out/bin/${x}") (targets version); -in assert supportedGhcVersions != []; stdenv.mkDerivation { + lib.concatMapStringsSep "\n" + (x: + "ln -s ${ + tunedHls (getPackages version) + }/bin/haskell-language-server $out/bin/${x}") + (targets version); + +in stdenv.mkDerivation { pname = "haskell-language-server"; version = haskellPackages.haskell-language-server.version; + buildCommand = '' mkdir -p $out/bin ln -s ${tunedHls (getPackages (builtins.head supportedGhcVersions))}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper - ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} + ${lib.concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} ''; + meta = haskellPackages.haskell-language-server.meta // { maintainers = [ lib.maintainers.maralorn ]; longDescription = '' This package provides the executables ${ - concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) + lib.concatMapStringsSep ", " (x: lib.concatStringsSep ", " (targets x)) supportedGhcVersions } and haskell-language-server-wrapper. You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 32bd62594bfda..d9490abad536e 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.17"; + version = "0.11.18"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-RDxHQgKVMqTFjiuxF87l4OXcAG9zIG8Xr0cnp/0J4Wg="; + hash = "sha256-JP0n1sepH9kFOdrKTmt7Q79pe4GQInYKQH3xi2/G59s="; fetchSubmodules = true; }; - cargoHash = "sha256-wQLECnW+z62okJKpebNvUeRCiUfbuHCou1/uhO8gH+0="; + cargoHash = "sha256-YCa4WL2sgdITKfdfH3PGdiRHbSkE6JSJRHipaN00GwA="; # skip flaky tests checkFlags = [ diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index f95483c144a21..732bd8d43f2b4 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.15.0"; + version = "1.16.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r1YJ7L98aLAwBd3g+WlW/UijceR7t9z7aXSZZjlMNnM="; + hash = "sha256-lXZCRoTVIguufyhHn7h4vAajG53qIn8AeDBZuha6be8="; }; - cargoHash = "sha256-Fx2BdSHo+W43ZM/SX1ccddXG9QHlftrupT2cbyT4KM0="; + cargoHash = "sha256-+r8fcoG23p7ug3xireAnUvJHiB/PXAUzBAKowGqKN8E="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix index d06f603dfa15b..9f8983305f7cf 100644 --- a/pkgs/development/tools/kafka-delta-ingest/default.nix +++ b/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { description = "A highly efficient daemon for streaming data from Kafka into Delta Lake"; homepage = "https://github.com/delta-io/kafka-delta-ingest"; license = licenses.asl20; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/kdoctor/default.nix b/pkgs/development/tools/kdoctor/default.nix index 9ef755afbcaff..6c6969482609f 100644 --- a/pkgs/development/tools/kdoctor/default.nix +++ b/pkgs/development/tools/kdoctor/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdoctor"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+92.zip"; - hash = "sha256-rGK5U1JeXID9OcT8uzO3oO6f9MZgrW69LUHbEtj0SSQ="; + url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip"; + hash = "sha256-H4lpdMf1AIU8BC+6DlvcwM1wLuEl+Hd9xBli/TGFMV4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/development/tools/language-servers/csharp-ls/default.nix index efc6307f1a6c7..cefb7a969a40c 100644 --- a/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -8,9 +8,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.8.0"; + version = "0.10.0"; - nugetSha256 = "sha256-F3N6ESE/VmQA5sOMm3eqSkhSNVCCsnAXTCC+McsAnQw="; + nugetSha256 = "sha256-1t8U2Q4lIlj2QwbnevAMMGcqtpPh5zk0Bd7EHa7qvCI="; dotnet-sdk = sdk_7_0; dotnet-runtime = sdk_7_0; diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index d91ec72ea6aec..5b40af17c3305 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.42"; + version = "0.0.45"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; - rev = "v${version}"; - hash = "sha256-Dn/xPjYCyJYlDNMUfl61L/tWq5mRJ8WD0G5qZH9OepY="; + rev = "refs/tags/v${version}"; + hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc="; }; postPatch = '' diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 3499d54ce0688..1c71adecebd20 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.66.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-tVeGfPm5WdZjARp7n4WD3YQzMUWA3M3TJo2oVivtkiA="; + hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM="; }; - cargoHash = "sha256-bXz216QvTpBuUNAi5sF0Lga+1ubjlokqPglUyAVXThg="; + cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5fb7386b08d48..7346469804ee2 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.29041"; + version = "0.1.29314"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEprN5I9ZWz4xTVdl4qZQHfbLbp4Khh63m37ZBq8pgA="; + sha256 = "sha256-RJ4WzKGmdfUHJASusVZqq8JKJlnrxxzV4IaZYuK8JTg="; }; - vendorHash = "sha256-EcQ5/zp041P4qi8nenrWuVItV3mFI3EHHRhKm/tqpfA="; + vendorHash = "sha256-eW36aQSK4W/HwTCPmeHIX53QN229KZhgGTb3oU10IcY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index bae63abbb7335..56bd85b77218e 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.8.0"; + version = "2.9.0"; format = "other"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "refs/tags/v${version}"; - hash = "sha256-9HFCFgpRXqefFJLulwvi6nx0fl0G6IXI9gSinekJXRU="; + hash = "sha256-4LEKVh3jNU3xOq75+IQezjhbL/6uAGQ3r0Au2cxx1WA="; }; patches = [ diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 5c9589920a600..37593e0090cad 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.15"; + version = "1.12.21"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-AEKzhNSNJOOyK/fiAepqios7xoexAi4M4zbMTPdyyeA="; + hash = "sha256-SjA5J9fILU/FBNXRS/cvGZVWAK2qqOyMsd6wC/CJYaE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix index 6d52dcaff6bbb..3fe98a6f43534 100644 --- a/pkgs/development/tools/misc/orogene/default.nix +++ b/pkgs/development/tools/misc/orogene/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; preCheck = '' diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix index 0438e65aede3e..d960292641fe0 100644 --- a/pkgs/development/tools/misc/scip/default.nix +++ b/pkgs/development/tools/misc/scip/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "scip"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; rev = "v${version}"; - hash = "sha256-8CH5rIWvCXZGspAyF6c8Qs/gntpfdpPrxrvxW3bZ/ww="; + hash = "sha256-lZ3W2Z69P5QQN+PgF9+Apj/uEXWaTS+5QOg17m1mGPU="; }; vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ="; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index ca1f6337dbdb0..81ef5745c925a 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-jMUPRgo/XS5nAq9fmonkFBgwY75AaLaZ+fw/qhgXpqE="; + hash = "sha256-uvSAqk9LE0NbOWn2rcygDu7Hl28Wu3KkM5UhI4aocGo="; }; - vendorHash = "sha256-pUPZvx6og4aZCAvgLK1AdeRHSfnX89h+/6F/4mmUTFI="; + vendorHash = "sha256-xoyassGp//8YXG/B1e3kW96UvltQLa662ZlH9/CMzm0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 9bc36338ff2e3..1948b6f8768a1 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.1"; + version = "5.11.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-ACdiFkV138jDIrRe+baYo+r9vCO4cyRyO2ck7OKakFY="; + hash = "sha256-bN2LvuB/BD21SL5fG9QNPpR9hUk52U2BJJ6TFMhwDBk="; }; - cargoHash = "sha256-bEeQOOucXd4HNTR6SmidAfDkZ1tT7ORmUxrNx+3FNRw="; + cargoHash = "sha256-V4hANIkReF7EEtFsBv1hA/Ftre6YQPs69LpG/GR0Egc="; 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.10.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.11.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; homepage = "https://github.com/latex-lsp/texlab"; + changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ doronbehar kira-bruneau ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index f281a70f8029d..ea725b013180b 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.pythonForBuild.interpreter} build.py --system-libclang --clang-completer --ninja + ${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 2d8b075a685c4..6c71e374ffc7b 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -11,7 +11,7 @@ let commonMeta = { license = lib.licenses.asl20; - homepage = "http://www.martiansoftware.com/nailgun/"; + homepage = "https://www.martiansoftware.com/nailgun/"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index 9fdb579b54262..7fa9595e18286 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.1.17"; + version = "10.2.1"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-03GDrKjlvl3O3kJlbbyDYxtlfwLkZbvxC9gvP534zSY="; + hash = "sha256-vnF+ES6RK4iiIJsWUV57DqoLischh+1MlmlK46Z6USY="; }; - npmDepsHash = "sha256-nZ9ant2c+15bRBikFcKZW8aiFqI3WC6hktSiBfnma/I="; + npmDepsHash = "sha256-9yd+k+HpARM63/esW+av0zfcuAVsp9Lkfp6hmUQO5Yg="; env = { npm_config_build_from_source = true; @@ -37,6 +37,5 @@ buildNpmPackage rec { license = licenses.mit; mainProgram = "nest"; maintainers = [ maintainers.ehllie ]; - broken = stdenv.isDarwin; # https://github.com/nestjs/nest-cli/pull/2281 }; } diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 1ef8ff9d35fdd..aeff229f832db 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "18.11.0"; + version = "18.22.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sUP2xBrh7JpAaHhiMm6AilgEUNIfK1U2hbloUJYHn6c="; + hash = "sha256-lQqDXiT+DRLmU+4DBvj2Gnd1RjaRgMorhXo1BmJLQqU="; }; - vendorHash = "sha256-i5K7f70MevNJcRsP2P9rsMZRpKPVWsTx9M4t2AoEJew="; + vendorHash = "sha256-/SVS0Vd6GvKEAzRobxaTwJ+uy8dwCINBOYzQN65ppAs="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index a9e7b25603f1c..cedaa46690aa0 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "nightly-2023-07-09"; + version = "nightly-2023-11-04"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "255ad5958026dc3a3116f621eaebd501b8b26a22"; - hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM="; + rev = "b19c24eb17e7c16bcfb3144665fd405fd5e580f3"; + hash = "sha256-c8mHVdXbn7aRKI/QBIZvBvl4sCNK49q+crQmTCjptwM="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation { description = "Language server for the Odin programming language"; homepage = "https://github.com/DanielGavin/ols"; license = licenses.mit; - maintainers = with maintainers; [ astavie ]; + maintainers = with maintainers; [ astavie znaniye ]; platforms = odin.meta.platforms; }; } diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 4acf2264fc9c5..28c922f2bd6b7 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; + hash = "sha256-D0K8Prc3yuaA2vqFs645WOn1ajeRLF+2uHWTP4+3OQ0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 1e9eec3f804c8..c8c553afad6ed 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -6,6 +6,15 @@ let in (haskell.lib.compose.overrideCabal (drv: { + # pandoc-cli's pandoc executable report the libraries version via --version, match that, + inherit (static.scope.pandoc) version; + # but prevent haskellPackages.mkDerivation from recomputing the src tarball based on that. + inherit (static) src; + # Make it possible to recover the cli version if necessary. + passthru = drv.passthru or {} // { + cliVersion = static.version; + }; + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; @@ -24,6 +33,9 @@ in remove-references-to \ -t ${haskellPackages.warp} \ $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.pandoc_3_1_8} \ + $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc @@ -36,5 +48,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; }) diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 28a83a07d8185..7308414504ed9 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "protoc-gen-grpc-web"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = finalAttrs.version; - sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw="; + sha256 = "sha256-yqiSuqan4vynE3AS8OnYdzA+3AVlVFTBkxTuJe17114="; }; sourceRoot = "${finalAttrs.src.name}/javascript/net/grpc/web/generator"; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index 47bdd5530e7ad..69fcacb4bc15c 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.zane ]; + mainProgram = "protolint"; }; } diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index f7a6e5555288f..75e32e0c7c1b9 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-vdhyzFUimc9gBsLpk7WKwQQ0YtGJg3us+6JCFnXSMrI="; + hash = "sha256-g52cIw0af/wQSuA4QhC2dCjcDGikirswBDAtwf8Drvo="; }; - cargoHash = "sha256-3p6X+EV4xQ+eh2ezPh5+cJxvoGErx0q2n5pESVf11Eg="; + cargoHash = "sha256-1jfKRpyGewNlvMkL/MKnOaRJyajwLAuw+YyeTyTtcP4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rufo/Gemfile.lock b/pkgs/development/tools/rufo/Gemfile.lock index f63ff520e687e..da772486670d2 100644 --- a/pkgs/development/tools/rufo/Gemfile.lock +++ b/pkgs/development/tools/rufo/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rufo (0.12.0) + rufo (0.16.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rufo BUNDLED WITH - 2.1.4 + 2.4.20 diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix index 1c63c3f3b7964..c1d65faba63da 100644 --- a/pkgs/development/tools/rufo/gemset.nix +++ b/pkgs/development/tools/rufo/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwasskcm0nrf7f52019x4fvxa5zckj4fcvf4cdl0qflrcwb1l9f"; + sha256 = "11nm1vzr3vd85yy4rd7ndrrx1ygm3m2jmw9r0b9lfxlj8rc1rip2"; type = "gem"; }; - version = "0.12.0"; + version = "0.16.2"; }; } diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/development/tools/rust/cargo-mommy/default.nix index b05282f4f779c..556446af316a5 100644 --- a/pkgs/development/tools/rust/cargo-mommy/default.nix +++ b/pkgs/development/tools/rust/cargo-mommy/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mommy"; - version = "0.1.1"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-p1SAYUQu1HpYJ6TbLJ3lfA9VlKHvB7z5yiFXmTQOCXA="; + sha256 = "sha256-/f6jHXwUJqAlqmVvvxfB4tvKkYwCmqI8GgPBHf5Qg1E="; }; - cargoSha256 = "sha256-5RidY+6EF23UNzz1suSdA4LL59FalipaJ+ISSsmiCXM="; + cargoSha256 = "sha256-hj6oRuTlCxGq5SosVBkVwrG0Sgv5iDz5naCXPueYFqM="; meta = with lib; { description = "Cargo wrapper that encourages you after running commands"; diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index 35d3fb133e851..15c5ad5145245 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -2,27 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-readme"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { - owner = "livioribeiro"; + owner = "webern"; repo = pname; - # Git tag is missing, see upstream issue: - # https://github.com/livioribeiro/cargo-readme/issues/61 - rev = "cf66017c0120ae198210ebaf58a0be6a78372974"; - sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; + rev = "v${version}"; + sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; }; - cargoSha256 = "sha256-Isd05qOuVBNfXOI5qsaDOhjF7QIKAG5xrZsBFK2PpQQ="; + cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; - patches = [ - (fetchpatch { - # Fixup warning thrown at build when running test-suite - # unused return, see upstream PR: - # https://github.com/livioribeiro/cargo-readme/pull/62 - url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch"; - sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s="; - }) + # disable doc tests + cargoTestFlags = [ + "--bins" "--lib" ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 2b682000c1b17..1c5564c723326 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -2,16 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "holmgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tumcGnYqY/FGP8UWA0ccfdAK49LBcT8qH6SshrDXNAI="; + sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; }; - cargoSha256 = "sha256-fcosKyGOy0SKrHbsKdxQJimelt1ByAM4YKo7WpHV8CA="; + cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + + checkFlags = [ + # Requires a rustup toolchain to be installed. + "--skip check_toolchain_listing_on_multiple_projects" + ]; meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 2660bc5d2352c..99c10f7d21f68 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "13.1.0"; + version = "13.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2j35R7QTn7Z3yqzOU+VWAoZfYodecDt45Plx/D7+GyU="; + sha256 = "sha256-yMHGn/RPtYuxS3rHzm87mW7nBUEaSOGsCT7Ckxvhabk="; }; - cargoHash = "sha256-OEv9LOep4YNWY7oixY5zD9QgxqSYTrcf5oSXpxvnKIs="; + cargoHash = "sha256-hO2W0NRV9fGHnnS1kOkQ+e0sFzVSBQk3MOm8qDYbA00="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 2449a6038ec19..dab324f352f10 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.21.2) - pg_query (2.1.3) - google-protobuf (>= 3.19.2) - sqlint (0.2.1) - pg_query (~> 2) + google-protobuf (3.25.0) + pg_query (4.2.3) + google-protobuf (>= 3.22.3) + sqlint (0.3.0) + pg_query (>= 1) PLATFORMS ruby @@ -14,4 +14,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 2.3.9 + 2.4.20 diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index 0bbd8fe005745..05925a45e69e8 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5g23mjc4fiwymrfkvgcmsym50rapw7vm988fm46rlpg3zijgl1"; + sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; type = "gem"; }; - version = "3.21.2"; + version = "3.25.0"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; type = "gem"; }; - version = "2.1.3"; + version = "4.2.3"; }; sqlint = { dependencies = ["pg_query"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wbsi0ivashmpgavz7j22qns3zcya8j6sd2f9y8hk8bnqx7i3ak0"; + sha256 = "06gljzjhbfvxs85699jr1p7y2j8hhi629kfarad7yjqy7ssl541n"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; } diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 8e7dc13393f07..417c66ea3a6f2 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-XQU/1uAas1bT7FSgBzJSPRe4ET9ysjpFGhV+qi23AAY="; + hash = "sha256-gFJaW7Mb3HKN6D/qnpfNQVxBOKbxIBZOVWJ63wiGoeU="; }; - cargoHash = "sha256-Qg2VcsAqXpYamO35t/lvlXUPTdjAqZ4z3Nm0hYdhjEM="; + cargoHash = "sha256-a1kAVIyGnVF3IWkDQbmV3L9cfY+1564RW6eWfBHbTZ8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix new file mode 100644 index 0000000000000..fdf103f190e13 --- /dev/null +++ b/pkgs/development/tools/subxt/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, cmake +}: + +rustPlatform.buildRustPackage rec { + pname = "subxt"; + version = "0.31.0"; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "subxt"; + rev = "v${version}"; + hash = "sha256-eEsb88f16Ug9h7JNkzwSTxJZEV5r4XmmzsTxTQGk+j8="; + }; + + cargoHash = "sha256-kcs55NgwsqgZXcx+a6g0o9KdUG4tt0ZBv3dU/Pb0NJk="; + + # Only build the command line client + cargoBuildFlags = [ "--bin" "subxt" ]; + + # Needed by wabt-sys + nativeBuildInputs = [ cmake ]; + + # Requires a running substrate node + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/paritytech/subxt"; + description = "Submit transactions to a substrate node via RPC."; + license = with licenses; [ gpl3Plus asl20 ]; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index c6ae034d509f4..1c795fe35acff 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.7.0"; - vendorHash = "sha256-Sq3Cr/iVW3OSHLujnR2fE5ZtJhYLiobkmKXKz8hjSus="; + version = "5.7.2"; + vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-wq+4czVQXQHV2Ci0zUV66+RiRREWawjH4i1i18T8RrA="; + hash = "sha256-2/2Hx+9MnnY4GMm/Zt6ssCTdtYgcP1gPRXe1yQMgXTE="; }; ldflags = [ diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/development/tools/teller/default.nix index 8930777229309..a906e6c1f5e57 100644 --- a/pkgs/development/tools/teller/default.nix +++ b/pkgs/development/tools/teller/default.nix @@ -19,6 +19,7 @@ buildGoModule { # use make instead of default checks because e2e does not work with `buildGoDir` checkPhase = '' runHook preCheck + HOME="$(mktemp -d)" # We do not set trimpath for tests, in case they reference test assets export GOFLAGS=''${GOFLAGS//-trimpath/} diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index ed1655cbd793b..2a72686cf96a1 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.86.3"; + version = "0.87.1"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-hTqjNQSScQzCUBs4pYgxRnRvUSoQXXeZIceSZAR1Oa0="; + hash = "sha256-wPL4fYFkk1rtHIYIVOGk5GG6S/pmOpg6WcbnpleDkUA="; }; - vendorHash = "sha256-EqND/W+NNatoBUMXWrsjNPfxAtX0oUASUxN6Rmhp7SQ="; + vendorHash = "sha256-Jf2ZLzODPnvNrED8ST0u7rHGWivPwcyptkJbu8mdnoA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index e83bb95d1f23b..0a7434a2ddf68 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.15.0"; + version = "5.16.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-KV5afgfQmQOJAPLNUjELB0+JZ8Qlz9wqOphZm/IBJcc="; + sha256 = "sha256-J/0g0HLn25KwQvphCq32qgX4Pdu+OmZT3UImcTS1o1M="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index eeccc89a7b18f..2f3bfbe8c2c84 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-vMyNsLXMJk8MTiZYRiGQpOLZfeJbKlYcG1U8xTQIty0="; + hash = "sha256-LOm4d6SV5rlb7NovhSp7V0JIaOfHIZOqeIcpIvTsZsA="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-+v2P9ISSA7Xy5fTjfVNETAStPo19dLxv5K57MC/GU4E="; + cargoHash = "sha256-Pz+jA4uC/40mj5Jn/lB+XcoN/QSD23iLwsEowTUI0pg="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix index 0213dfcf77956..51ecc3804a056 100644 --- a/pkgs/development/tools/wgo/default.nix +++ b/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.3"; + version = "0.5.4"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-Uny5FiMox0oIaJ+WE7p3kw4guSzktEF+WzuxjgFXh2I="; + hash = "sha256-MPmB6G5JCIEfFYchVmV8sS5Zfzfui9tClDI6RlLdP6U="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index b8181e812fc2e..e9ae6ef416a07 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "yarn-berry"; - version = "3.4.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${version}"; - hash = "sha256-eBBB/F+mnGi93Qf23xgt306/ogoV76RXOM90O14u5Tw="; + hash = "sha256-9QNeXamNqRx+Bfg8nAhnImPuNFyqrHIs1eF9prSwIR4="; }; buildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = with lib; { homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management."; license = licenses.bsd2; - maintainers = with maintainers; [ ryota-ka ]; + maintainers = with maintainers; [ ryota-ka thehedgeh0g ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 2e870975d3396..9dbbd19d46808 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.35.2"; + version = "4.40.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-iQJx++MeyXT7hS4NATvzYq+YErTEKYCajAzcn1QIWDU="; + hash = "sha256-S2hsZkospf1VMH/fDLiALEraOA8dbG62JejGY2T/tRU="; }; - vendorHash = "sha256-nh7boYBNYvNe+uMxV460bkmWQ61VYuvFYQ5CIaNEv98="; + vendorHash = "sha256-ggb8ZX2KBj/oY+vomCme/7KlnfsykMm4l027kwlxpWY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index b5f9229776195..f0f8a3454550f 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.7"; + version = "1.0.11"; 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-aPFKKCqjKZSz/ZX5G3RiIkLHIj89MGPp+PgFbE4vpgE="; + hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-u2UlimmIE2z7qsqkAbSfi7kxuOjlJGkX4RAsUGMklGc="; + hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-MO01plCsZRR+2kC2J0/VhXJIhchMfLtMFvidPNAXtB4="; + hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-yw17x8DmKktE5fNBF3JQdVSEXFwAotA7hCzfLcd6JoI="; + hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 71c206dfda924..603c9bf5d9e25 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.37.2"; + version = "1.38.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-F04Dxt3pLtUaku6bWGDSwJQwk/NUyBfZPhT7zLyBq48="; + hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4="; }; - cargoHash = "sha256-PfChqb2yMFk4HAAspkKHjstlxCTkEA2k+VRMf8MVwTw="; + cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 4f68176858132..20fd20a5b9884 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.79.2"; + version = "0.81.0"; shas = { - x86_64-linux = "sha256-efpB4BayPvB7KrP9v+U/jlS+Vs7QeURmPm5dnGmDD8Q="; - aarch64-linux = "sha256-agtWSohMkkhxfKU+BQvHXomZSxVQLafma4IfiDO7vvo="; - x86_64-darwin = "sha256-UWZAm7punliDUOOdD+vqZXpChyMXw5AMw8kgJ6nclzs="; - aarch64-darwin = "sha256-p8lulv3E9A48nMH1KdROSY0L3Q/hqPVtTp9qIpUl1SM="; + x86_64-linux = "sha256-e77LYm/sus7EY4eiRuEp6G25djDaT4wSD4FBCxy4vcE="; + aarch64-linux = "sha256-wPfUcuT2Z2sy5nLf8xR3QjGQKk6OsM/45jnYv/Hw+Zs="; + x86_64-darwin = "sha256-UbnRiywM7b7q3rITZzNeWAuKU+HXXAqVapQ9j5ND6go="; + aarch64-darwin = "sha256-42d3VGBv5lW1InfzYfWr6Xj0GpyJ6GWswVNtUa8ID30="; }; } diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 3450c693d454a..9990cf4553a49 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Lh0bfU1A/deQiTunjGbhErd8GXiVwCJCI3cuvClVRTU="; + sha256 = "sha256-v+AAIDWRAgBXmhX2BecEio4s5dVA77K+YycZY1k9uvg="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index fcf64ae69de96..9fb23dc7fc98c 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.43.0"; + version = "0.43.1"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-WZX0OugHFuqXxwq7LLGzEG/H+pz9siBukvgBCu5/isI="; + hash = "sha256-+AhvRHw/u66ziqhlHE4BShgoimInE+vT5/kbMn69VF4="; }; dontConfigure = true; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index d633c594d87f5..7404be23bc641 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "23.10"; + version = "23.10.1"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-dfL95UKu6kwD4WHLtXlIdkf5UItEtW2WCAKP7YGlCtc="; + sha256 = "sha256-Kv0SH+bLnBSM/tYHe2kEJc4n7izZTBNWQs2nm/teLEU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-Y8BZ7EA6Dn4+5kMCFyuXi17XDLn9YRxqVGautt9WUOo="; + sha256 = "sha256-MSlKsEv4N/H7G1bUOBlPBXerpHIW32P6Va02aRq1+54="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-IrKWJ16gMCR2MH8dgYUCtMj6mDQP18+HQr17hfekPIs="; + sha256 = "sha256-jEm9WJBXx77KpldzBuxK1Pu6VGiARZPnRmMhEjZdm1I="; }; }; @@ -45,7 +45,7 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 atemu ]; + maintainers = with maintainers; [ mahmoudk1000 ]; }; passthru = { inherit sources; }; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index e5b0f838be1af..d7f5694bfb6ce 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index e24432a25bbf5..0e4ca1aad882f 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -44,7 +44,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers; changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; }; }); diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index e7e57a5955609..3f6b02ddbb984 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; - sha256 = "sha256-U8lsHrw40Xo6a3jZw6GiPnOALvvg9PdecVAdkZewUjg="; + sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U="; }; dontUnpack = true; @@ -32,24 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OajjGj/Bgqg8H/6PjXkwJHwbSQqtzbQ1b3Xwk3aI3jc="; - }; - - # Of all the files in the source and data archives, there doesn't seem to be - # a decent icon :-) - iconsrc = fetchurl { - url = "https://wiki.flightgear.org/w/images/6/62/FlightGear_logo.png"; - sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p"; - }; - - desktopItem = makeDesktopItem { - name = "flightgear"; - exec = "fgfs"; - icon = iconsrc; - comment = "FlightGear Flight Simulator"; - desktopName = "FlightGear"; - genericName = "Flight simulator"; - categories = [ "Game" "Simulation" ]; + sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -60,11 +43,6 @@ stdenv.mkDerivation rec { glew qtdeclarative curl ]; - postInstall = '' - mkdir -p "$out/share/applications/" - cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/ - ''; - qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; @@ -75,5 +53,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; + mainProgram = "fgfs"; }; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 6674c85c33237..94f8a28add9bd 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; - homepage = "http://hedgewars.org/"; + homepage = "https://hedgewars.org/"; license = licenses.gpl2; longDescription = '' Each player controls a team of several hedgehogs. During the course of diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index eca0860207096..65ff3b90403fc 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-kCvMUhN1kjGb5rV+lkKm1FFYBJUSQGOKTY1DQdiAWLU="; + hash = "sha256-umPQIxwIahjbO4QbkKEoeSSeYT2UatsTGRPrLgw5KW8="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-kHZL7TENVK58dvr8PBFtWYZ2PSKEYESX4e1xYmMA5+Y="; + hash = "sha256-o5ztk4okH21Op1jqHZfranR12M8B1Y/K95aWb10tf5o="; }; nativeBuildInputs = [ @@ -45,8 +45,18 @@ in stdenv.mkDerivation rec { ./remove-drm-support.patch # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. ./fix-non-steam-shortcuts.patch + # Fix reg add infinite loop + # Submitted upstream: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3210 + ./fix-infinite-loop.patch ]; + postPatch = '' + # We are not packaging this as an Electron application bundle, so Electron + # reports to the application that is is not "packaged", which causes Heroic + # to take some incorrect codepaths meant for development environments. + substituteInPlace src/**/*.ts --replace 'app.isPackaged' 'true' + ''; + configurePhase = '' runHook preConfigure diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index f406cf187b43a..24f7c96bc9f91 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -29,6 +29,7 @@ buildFHSEnv { perl psmisc python3 + unzip which xorg.xrandr zstd diff --git a/pkgs/games/heroic/fix-infinite-loop.patch b/pkgs/games/heroic/fix-infinite-loop.patch new file mode 100644 index 0000000000000..99aae02c3a1a4 --- /dev/null +++ b/pkgs/games/heroic/fix-infinite-loop.patch @@ -0,0 +1,23 @@ +From b698779053b7ba31bd8e69b230e86515e3019bf6 Mon Sep 17 00:00:00 2001 +From: K900 <me@0upti.me> +Date: Sun, 5 Nov 2023 22:04:32 +0300 +Subject: [PATCH] Force add the registry entry + +Otherwise, newer Wine versions will prompt to overwrite it and loop there forever. +--- + src/backend/storeManagers/legendary/setup.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/storeManagers/legendary/setup.ts b/src/backend/storeManagers/legendary/setup.ts +index 1837106621..b5c2432435 100644 +--- a/src/backend/storeManagers/legendary/setup.ts ++++ b/src/backend/storeManagers/legendary/setup.ts +@@ -20,7 +20,7 @@ export const legendarySetup = async (appName: string) => { + + // Fixes games like Fallout New Vegas and Dishonored: Death of the Outsider + await runWineCommandOnGame(appName, { +- commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher'], ++ commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher', '/f'], + wait: true, + protonVerb: 'waitforexitandrun' + }) diff --git a/pkgs/games/heroic/remove-drm-support.patch b/pkgs/games/heroic/remove-drm-support.patch index f3cd80f003f3c..44045bef2bf6a 100644 --- a/pkgs/games/heroic/remove-drm-support.patch +++ b/pkgs/games/heroic/remove-drm-support.patch @@ -1,22 +1,26 @@ diff --git a/src/backend/main.ts b/src/backend/main.ts -index 2cd1a28f..a60e04d0 100644 +index 83b58bb2..f61656fa 100644 --- a/src/backend/main.ts +++ b/src/backend/main.ts -@@ -19,8 +19,7 @@ import { - powerSaveBlocker, +@@ -19,7 +19,6 @@ import { protocol, screen, -- clipboard, -- components -+ clipboard + clipboard, +- components, + session } from 'electron' import 'backend/updater' - import { autoUpdater } from 'electron-updater' -@@ -286,8 +285,7 @@ if (!gotTheLock) { - initImagesCache() +@@ -310,14 +309,7 @@ if (!gotTheLock) { + } if (!process.env.CI) { -- await components.whenReady() +- await components.whenReady().catch((e) => { +- logError([ +- 'Failed to download / update DRM components.', +- 'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps', +- e +- ]) +- }) - logInfo(['DRM module staus', components.status()]) + logInfo('DRM modules disabled for nixpkgs') } diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index c59418ac1a436..bca6c8ecf8b96 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "hikounomizu"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; - hash = "sha256-Hw/BA7jOW9KGdde1NLDh4SfQXxvZkNGx/sHXukgFZ5M="; + hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; nativeBuildInputs = [ diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index cd24a44f92a52..2735cfff1946b 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.roguetemple.com/z/hyper/"; + homepage = "https://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 569148f2cf505..5fce31eaa837e 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.33"; + version = "unstable-2023-10-14"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; - rev = "refs/tags/${version}"; - sha256 = "sha256-fEQUChkxrKV2IkFGORUolZE2qTzA10Xxogjl5Va4TcE="; + rev = "450784283dd49152dda6322db2fb2ef33e7c382e"; + sha256 = "sha256-iwIaxD35tkOX6NX1SVNmN2OQACwaX/C4xnfgT5YcUvg="; }; propagatedBuildInputs = [ diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index beb444ae11ec9..e3bf056fc3cf1 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.0.0"; + version = "unstable-2023-10-03"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "f5f3b96f6483c59cfc646afbda6e97cb0bd94778"; - hash = "sha256-HibY3U9/MibEDwHY+YiErW/pz6qwtps8wwjhznTISgA="; + rev = "8f7ab2650fc730efc8960b5fcd71421d724a4108"; + hash = "sha256-Vhjp9JX8VX0PWsvEh5eOhz7vsIEaiCyPNPOjibE8GXo="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/games/openra/engines/release/default.nix index 7c778679f30a9..3b1715aca5dde 100644 --- a/pkgs/games/openra/engines/release/default.nix +++ b/pkgs/games/openra/engines/release/default.nix @@ -2,7 +2,7 @@ buildOpenRAEngine { build = "release"; - version = "20230225"; - sha256 = "sha256-f1OwyxNNn1Wh5sfz4s81bbHDY6ot2tvjMD8EK87Hc7k="; + version = "20231010"; + sha256 = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; deps = ./deps.nix; } diff --git a/pkgs/games/openra/engines/release/deps.nix b/pkgs/games/openra/engines/release/deps.nix index 81863502e1a24..877e93c608636 100644 --- a/pkgs/games/openra/engines/release/deps.nix +++ b/pkgs/games/openra/engines/release/deps.nix @@ -3,29 +3,27 @@ { fetchNuGet }: [ (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) - (fetchNuGet { pname = "Linguini.Bundle"; version = "0.3.1"; sha256 = "14dz8idlr8pxv1psqbc4v3v460naj2kixwv2kwr5y11v4dj6vnvj"; }) - (fetchNuGet { pname = "Linguini.Shared"; version = "0.3.0"; sha256 = "0hvml8qkb73408aqyb49dp6b168jrr6g1n0qszdhmgax4mgxdqxf"; }) - (fetchNuGet { pname = "Linguini.Syntax"; version = "0.3.0"; sha256 = "1qgj6vbdjjl30cqcyn8df30jj15c2ahj7clgb5fwcja47mnw3jd8"; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.5.0"; sha256 = "0515ifvvqhmhwdf7kw1wpamxn588hi150v6b8p4jfmr07y1dc4ml"; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.5.0"; sha256 = "1y45lf6ipa53469sdz110d16rxfyrkdr2xscgagwg07lr2833nbb"; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.5.0"; sha256 = "06438fc5mizi702n8d7pqa21n5i7kwl1bwzxfy1l883j9gh64gjp"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; sha256 = "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm"; }) (fetchNuGet { pname = "MP3Sharp"; version = "1.0.5"; sha256 = "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.CommandLine"; version = "4.4.1"; sha256 = "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab"; }) - (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; }) - (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.20"; sha256 = "0nq52kdpwsvmhxgcv26wajvn3yxd5l89918rnrzxa463hmyb2rmv"; }) - (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.9"; sha256 = "1i5clsxszmdkhjcdkp9324zidhzp0dsvn7cbcgrnafs18yabjmzq"; }) + (fetchNuGet { pname = "NVorbis"; version = "0.10.5"; sha256 = "0yiqqlb8mmnz04yq4iykkxq9np4m29z29bjwm5ic0adyq8fr4cnl"; }) + (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.22"; sha256 = "134ar57v7k5i4zb7xl9j2f6abwjjhl5kwx3cap5zrb5jdfb1x42p"; }) + (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.11"; sha256 = "1gb1mpckj2ji64fyca6cd1lbl7adyfjl5czgvhllhgv5h2jfwir1"; }) (fetchNuGet { pname = "OpenRA-FuzzyLogicLibrary"; version = "1.0.1"; sha256 = "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim"; }) - (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.19"; sha256 = "1ywm3b15qywrxby3s9wjs9flfjq7vld0gqz0xw4psgvz38gdgh7p"; }) - (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.36"; sha256 = "1vywf2bfqkq0mr58gfd5kafv12rri2bzfajajcj8ha9fmhdibj3s"; }) - (fetchNuGet { pname = "Pfim"; version = "0.10.3"; sha256 = "1myjs99g14q1yj3j5hzhx8ic7i3rqh2mi3qy9gdfzi6n9dlz1b3d"; }) + (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.22"; sha256 = "05bxqdams1s4la5fqlsijzmja1wf59gcy5y04jh91996q9glkq1d"; }) + (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.40"; sha256 = "0ysrryn63akysiv92mh0mra87pd8l8zvahp8pbxsliapdfq2n2qk"; }) + (fetchNuGet { pname = "Pfim"; version = "0.11.2"; sha256 = "1mf91sfxa4c5xp5qmgyc85v84aprhgdy951f1f41xmygvmkk94mp"; }) (fetchNuGet { pname = "rix0rrr.BeaconLib"; version = "1.0.2"; sha256 = "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -62,8 +60,9 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) - (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) + (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) + (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -110,5 +109,5 @@ (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) + (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) ] diff --git a/pkgs/games/prismlauncher/0001-launcher-translations-explicitly-convert-QVector-ite.patch b/pkgs/games/prismlauncher/0001-launcher-translations-explicitly-convert-QVector-ite.patch deleted file mode 100644 index c1e4731d01486..0000000000000 --- a/pkgs/games/prismlauncher/0001-launcher-translations-explicitly-convert-QVector-ite.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c39637720109dd5d97750907c51e9c0fb8f43f0b Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Wed, 11 Oct 2023 22:51:23 -0400 -Subject: [PATCH] launcher/translations: explicitly convert QVector iterators - to pointers - ---- - launcher/translations/TranslationsModel.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp -index 2763cca2..64c21dbd 100644 ---- a/launcher/translations/TranslationsModel.cpp -+++ b/launcher/translations/TranslationsModel.cpp -@@ -524,7 +524,7 @@ Language * TranslationsModel::findLanguage(const QString& key) - } - else - { -- return found; -+ return &(*found); - } - } - -@@ -655,8 +655,7 @@ QModelIndex TranslationsModel::selectedIndex() - auto found = findLanguage(d->m_selectedLanguage); - if(found) - { -- // QVector iterator freely converts to pointer to contained type -- return index(found - d->m_languages.begin(), 0, QModelIndex()); -+ return index(found - &(*d->m_languages.begin()), 0, QModelIndex()); - } - return QModelIndex(); - } --- -2.42.0 - diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 2347c8b53ee71..2409794cdfdcb 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , canonicalize-jars-hook , cmake , cmark @@ -23,53 +22,24 @@ let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; repo = "libnbtplusplus"; - rev = "2203af7eeb48c45398139b583615134efd8d407f"; - sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; + rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; + hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; }; in assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; -stdenv.mkDerivation -rec { +stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; - rev = version; - sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; + rev = finalAttrs.version; + hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA="; }; - patches = [ - ./0001-launcher-translations-explicitly-convert-QVector-ite.patch - ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/PrismLauncher/PrismLauncher/pull/1452 - # These patches allow us to disable the Sparkle updater and cmake bundling - # TODO: remove these when updating to 8.0 - (fetchpatch { - name = "disable-sparkle-when-url-is-empty.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; - hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; - }) - (fetchpatch { - name = "make-install_bundle-cached.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; - hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; - }) - (fetchpatch { - name = "dont-include-sparkle-when-not-enabled.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; - hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; - }) - (fetchpatch { - name = "introduce-internal-updater-variable.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; - hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; buildInputs = [ @@ -113,4 +83,4 @@ rec { license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; }; -} +}) diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 522a8e39fd88c..9a3597937d8ca 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.20"; + version = "8.30"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; + sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE="; }; postPatch = '' diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 0f71164f62fd1..a4963eb2a9d1a 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,69 +1,63 @@ -{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }: - -stdenv.mkDerivation rec { +{ lib +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, maven +, jre +, xorg +, gitUpdater +}: + +maven.buildMavenPackage rec { pname = "runelite"; - version = "2.5.0"; - - jar = fetchurl { - url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ=="; - }; + version = "2.6.9"; - icon = fetchurl { - url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; - hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ=="; + src = fetchFromGitHub { + owner = "runelite"; + repo = "launcher"; + rev = version; + hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q="; }; - - # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually - jogl = fetchurl { - url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; - hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg=="; - }; - gluegen = fetchurl { - url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar"; - hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A=="; - }; - dontUnpack = true; + mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg="; desktop = makeDesktopItem { name = "RuneLite"; type = "Application"; exec = "runelite"; - icon = icon; + icon = "runelite"; comment = "Open source Old School RuneScape client"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; categories = [ "Game" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; - installPhase = '' - mkdir -p $out/share/runelite - mkdir -p $out/share/applications - mkdir -p $out/natives + # tests require internet :( + mvnParameters = "-Dmaven.test.skip"; + nativeBuildInputs = [ makeWrapper ]; - unzip ${jogl} 'natives/*' -d $out - unzip ${gluegen} 'natives/*' -d $out + installPhase = '' + mkdir -p $out/share/icons - ln -s ${jar} $out/share/runelite/RuneLite.jar - ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop + cp target/RuneLite.jar $out/share + cp appimage/runelite.png $out/share/icons - # RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place makeWrapper ${jre}/bin/java $out/bin/runelite \ - --chdir "$out" \ --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ - --add-flags "-jar $out/share/runelite/RuneLite.jar" + --add-flags "-jar $out/share/RuneLite.jar" ''; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.bsd2; - maintainers = with maintainers; [ kmeakin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ kmeakin moody ]; platforms = [ "x86_64-linux" ]; + mainProgram = "runelite"; }; } diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index d048e7746aacf..625fe50108337 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,16 +5,16 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.1.4"; + version = "2.2.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-WbRvsHxTYYlhJavYVGMGK25fXEfSfnIztJ6KuCgBjF8="; + hash = "sha256-0wSlCazsy3TYckWc2bQJL1xBVN2DuYsBIbb9Ajnfl7M="; }; - depsHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; + depsHash = "sha256-QfAV6LYD6S/8ptaqqKSDtOe4kStwp6LJp8WVc3sH8yc="; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; diff --git a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch index b7d051541d177..fb905939f66d5 100644 --- a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch +++ b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch @@ -21,7 +21,7 @@ diff --git a/build.gradle b/build.gradle appName = 'Summoning Pixel Dungeon' appPackageName = 'com.trashboxbobylev.summoningpixeldungeon' - appVersionCode = 430 + appVersionCode = 432 - appVersionName = '@version@-' + details.gitHash.substring(0, 7) + appVersionName = '@version@' diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix index beec48b746cc8..488110684c096 100644 --- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -6,14 +6,14 @@ callPackage ./generic.nix rec { pname = "summoning-pixel-dungeon"; - version = "1.2.5"; + version = "1.2.5a"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Summoning-Pixel-Dungeon"; # The GH release is named "$version-$hash", but it's actually a mutable "_latest" tag - rev = "fc63a89a0f9bdf9cb86a750dfec65bc56d9fddcb"; - hash = "sha256-n1YR7jYJ8TQFe654aERgmOHRgaPZ82eXxu0K12/5MGw="; + rev = "89ff59e7f42abcc88b7a1f24391f95ddc30f9d29"; + hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; }; patches = [(substitute { diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 61df2e54c2283..9979d16247c02 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , cmake , ninja , p7zip @@ -47,23 +46,13 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; + hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U="; }; - patches = [ - # Upstream patch for curl-8.4 support, - # TODO: remove on next release. - (fetchpatch { - name = "curl-8.4.patch"; - url = "https://github.com/Warzone2100/warzone2100/commit/db1cf70950d4fa6630f37a7bf85f548b48ed53cd.patch"; - hash = "sha256-/jRan5pi7CamZaCaRdfugFmtCbWTKmCt63q0NBuTrFk="; - }) - ]; - buildInputs = [ SDL2 libtheora diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 74c2be586ceb6..6baf397ad678d 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imake ]; src = fetchurl { - url = "http://www.xskat.de/xskat-${version }.tar.gz"; + url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${version}.tar.gz"; sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.free; longDescription = "Play the german card game Skat against the AI or over IRC."; - homepage = "http://www.xskat.de/"; + homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; } diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index f5edc72934073..1a3b4ebfbef69 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; - homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; + homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index aa2414df1f84d..fe6c5a21ceb20 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.6.1"; + version = "10.6.2"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-O71stl9vLbeNOtW9XeUuKSpB2JmnM4sawN+iFoTJHas="; + hash = "sha256-j4dqLV1Q17RQczkTqGTh8S8Y6ELqXjWuJRr+xB/x2yE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-g4cUjvFH5F/GfABgG2GKS04XlyJuM+xJ3oQAqT3xjis="; + vendorHash = "sha256-aCekNpf6C5fGIEk0pLkz4hJ6mQfBIzeCsIL6Fxf2QGk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/os-specific/darwin/aldente/default.nix b/pkgs/os-specific/darwin/aldente/default.nix index 6dd464a405f0f..7ca454609aedc 100644 --- a/pkgs/os-specific/darwin/aldente/default.nix +++ b/pkgs/os-specific/darwin/aldente/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-bREI0RS4xvEccyw3yed5aD8oG5wmD5hyG82qW2tqlEA="; + hash = "sha256-pSqBDDumCbORLQ+B3skSqKmgG2KybR5Zb4ojiNQcAaM="; }; dontBuild = true; diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 702da5a1718b7..e218ef0916694 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.18.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-GeFB+eE/NW9ZopwVSmSfMK3WiJLCJNXOdmQpYc3m8WE="; + hash = "sha256-Ge15Df65fvNJ8ZdJ8giqvYytIivup2IIFPS+Ie3Yl9A="; }; buildInputs = [ @@ -43,6 +43,12 @@ stdenv.mkDerivation (finalAttrs: { SkyLight ]; + # NOTE: Release didn't bump patch version remove with next release + postPatch = '' + substituteInPlace src/sketchybar.c \ + --replace "#define PATCH 0" "#define PATCH 1" + ''; + makeFlags = [ target ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 748db1a62b5bf..df618cbff5a12 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { dbus gobject-introspection umockdev - (python3.pythonForBuild.withPackages + (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix index 8f258d227bb12..e7da864b90c15 100644 --- a/pkgs/os-specific/linux/ch9344/default.nix +++ b/pkgs/os-specific/linux/ch9344/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.wch-ic.com/"; + homepage = "https://www.wch-ic.com/"; downloadPage = "https://www.wch.cn/downloads/CH9344SER_LINUX_ZIP.html"; description = "WCH CH9344/CH348 UART driver"; longDescription = '' diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 894ff5652bbb0..bd34ac0db4d31 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20="; }; - env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error" + "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility + "-Wno-error=sign-compare" + ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -43,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19"; + broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.6"; }; } diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index b76a77fb3a601..283e04b475458 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -4,6 +4,8 @@ in { stdenvNoCC, fetchzip, lib, + rdfind, + which, }: stdenvNoCC.mkDerivation rec { @@ -15,6 +17,11 @@ stdenvNoCC.mkDerivation rec { hash = source.sourceHash; }; + nativeBuildInputs = [ + rdfind + which + ]; + installFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 722970e8945c1..afe371a8887bd 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,6 @@ -# This file is autogenerated! Run ./update.sh to regenerate. { - version = "20231030"; - revision = "20231030"; - sourceHash = "sha256-ocqikHJfvs4gWqnBeLgSnXHzUTPi8l8cSfNarhD8G3w="; - outputHash = "sha256-vaMYuAqkkuyY+bAxAe0uAokWZ7HlaR62UTu4L8yOofs="; + version = "20231111"; + revision = "20231111"; + sourceHash = "sha256-S9Xkj2CbamHxqjTDfqRJu91MNrSntxrQ7HYyhvdH6Jo="; + outputHash = "sha256-Qrz9fSHUQf0Gl8pfol4yfe95sD8DQV/+riT1NCFussQ="; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d44db7adf159e..43f7ed5cb3a1d 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + + substituteInPlace src/lib/src/fwts_devicetree.c \ + src/devicetree/dt_base/dt_base.c \ + --replace "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix new file mode 100644 index 0000000000000..ac297c78e10e4 --- /dev/null +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation { + pname = "hid-tmff2"; + # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12 + version = "0.81"; + + src = fetchFromGitHub { + owner = "Kimplul"; + repo = "hid-tmff2"; + rev = "ca168637fbfb085ebc9ade0c47fa0653dac5d25b"; + hash = "sha256-Nm5m5xjwJGy+ia4nTkvPZynIxUj6MVGGbSNmIcIpziM="; + # For hid-tminit. Source: https://github.com/scarburato/hid-tminit + fetchSubmodules = true; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installFlags = [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; + + postPatch = "sed -i '/depmod -A/d' Makefile"; + + meta = with lib; { + description = "A linux kernel module for Thrustmaster T300RS, T248 and TX(experimental)"; + homepage = "https://github.com/Kimplul/hid-tmff2"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rayslash ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index a35bd38add276..e4b41f3a0c824 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = "https://w1.fi/hostapd/"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; - maintainers = with maintainers; [ ninjatrappeur hexa ]; + maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix index 9429bd28306d0..62e6149b6f13d 100644 --- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "23.08"; + version = "23.11"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-T97cTJLGSJgOoQFgL/lI+AldqsCEcHilhTTDZy+pmU8="; + sha256 = "sha256-/OSU/7QR8NAjcAIo+unVQfORvCH5VpjfRn5sIrCxwbE="; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 33b7f88493df9..d8f8bb2fa73f9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,21 +52,31 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.60-hardened1.patch", - "sha256": "1k0807jpjljf2fcjxnmvd9rb8y8xqj21x2qn4yd72c58jkii52qq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.60-hardened1/linux-hardened-6.1.60-hardened1.patch" + "name": "linux-hardened-6.1.61-hardened1.patch", + "sha256": "0d9zhh32dx1q828q50kmznmsa6yinppbklhgg8ix7b7k23857ha6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.61-hardened1/linux-hardened-6.1.61-hardened1.patch" }, - "sha256": "02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq", - "version": "6.1.60" + "sha256": "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d", + "version": "6.1.61" + }, + "6.4": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.4.16-hardened1.patch", + "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" + }, + "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", + "version": "6.4.16" }, "6.5": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.5.8-hardened1.patch", - "sha256": "09dvz9massj8rwrwvr2n1y2v8k4c3ic8gfrp049p7g0npzag2cwl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.8-hardened1/linux-hardened-6.5.8-hardened1.patch" + "name": "linux-hardened-6.5.10-hardened1.patch", + "sha256": "0p2lj7ryiizr1sxvm2kgds3l8sg9fns35y2fcyqq61lg7ymzj1fi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.10-hardened1/linux-hardened-6.5.10-hardened1.patch" }, - "sha256": "05zpdh4dxaadq52hlczdmwb7bsqfm3q45v7bdqbsmplhgn4wm719", - "version": "6.5.8" + "sha256": "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1", + "version": "6.5.10" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 082223924995f..967489745f5e2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,16 +4,16 @@ "hash": "sha256:1zzd32ya4hldfywicgpnc2cyd412s7q9c31qvxx2nl9nkx11xsxv" }, "6.5": { - "version": "6.5.10", - "hash": "sha256:12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1" + "version": "6.5.11", + "hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif" }, "6.4": { "version": "6.4.16", "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" }, "6.1": { - "version": "6.1.61", - "hash": "sha256:1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d" + "version": "6.1.62", + "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" }, "5.15": { "version": "5.15.137", @@ -24,19 +24,19 @@ "hash": "sha256:1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0" }, "5.4": { - "version": "5.4.259", - "hash": "sha256:195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz" + "version": "5.4.260", + "hash": "sha256:1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q" }, "4.19": { - "version": "4.19.297", - "hash": "sha256:0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx" + "version": "4.19.298", + "hash": "sha256:0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x" }, "4.14": { - "version": "4.14.328", - "hash": "sha256:1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x" + "version": "4.14.329", + "hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny" }, "6.6": { - "version": "6.6", - "hash": "sha256:1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr" + "version": "6.6.1", + "hash": "sha256:0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns" } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 843942fd15b4d..82b17d461d2b7 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.61"; - hash = "sha256-15dAzCcFUekBlkBfcHWiZ3gourimLp6GlUKeWAddDqo="; + version = "6.1.62"; + hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw="; variant = "lts"; }; mainVariant = { - version = "6.5.10"; - hash = "sha256-t99LKAmNApcjFVna3ChNZp4O6ag9t2kQVrg8yRsTANg="; + version = "6.5.11"; + hash = "sha256-1bb5LG6JvqX5eNSe2Xyu86HxaqkUVkKUf1H3T7bFkGE="; variant = "main"; }; @@ -44,9 +44,9 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; - # Preemptive Full Tickless Kernel at 500Hz - HZ = freeform "500"; - HZ_500 = yes; + # Preemptive Full Tickless Kernel at 250Hz + HZ = freeform "250"; + HZ_250 = yes; HZ_1000 = no; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 5b418b6a7cc66..5e949a6f461ec 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.6"; #zen + version = "6.6.1"; #zen suffix = "zen1"; #zen - sha256 = "0rda54h5lg2llbwkj2h4mqfshjyha1dzlcwhx099is7g2lfzksxx"; #zen + sha256 = "13m820wggf6pkp351w06mdn2lfcwbn08ydwksyxilqb88vmr0lpq"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.10"; #lqx + version = "6.5.11"; #lqx suffix = "lqx1"; #lqx - sha256 = "10bny5x2a3brfamyajvnl75h7s64vvmymgnvwgaq82q4bmsfcdd1"; #lqx + sha256 = "02k4cfiygrfgyp3x6ivr7h6klknjzd5cwpszjnzcy2jc547512pd"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index 0d146613542dd..4762b63eda9bf 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "KMS/DRM based System Console"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; + homepage = "https://www.freedesktop.org/wiki/Software/kmscon/"; license = licenses.mit; maintainers = with maintainers; [ omasanori ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index c9eea70db9920..5248c263b3b2e 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (pythonSupport) '' cd python - ${python.pythonForBuild.interpreter} setup.py install --prefix=../pythonlib + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=../pythonlib cd - ''; diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 564fa4537c8f4..129bb49e81e9a 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ninja perl # for kernel-doc pkg-config - python3.pythonForBuild + python3.pythonOnBuildForHost swig ]; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index ec6d3f5aa4bfe..695012effc5c9 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=y" ] ++ optionals enablePython [ - "PYTHON=${python3.pythonForBuild.interpreter}" + "PYTHON=${python3.pythonOnBuildForHost.interpreter}" "PYTHONLIBDIR=$(py)/${python3.sitePackages}" ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index b58d471680b5a..c489e746886fd 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.intel.com/"; + homepage = "https://www.intel.com/"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index aadecf3f72a8b..81590a6f86921 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/twosigma/nsncd"; license = licenses.asl20; - maintainers = with maintainers; [ flokli ninjatrappeur ]; + maintainers = with maintainers; [ flokli picnoir ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e6f366f3433f6..7fec21a8237bb 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -59,11 +59,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.15"; + version = "535.43.16"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-DyEBrVV9DmeeOU2C0eitQLh9mGo4kxG3xxRsImrIFyo="; - openSha256 = "sha256-eW0Z70BTF0j8TmsOiVzbLOyiyScR/7hgEp9GYI9RZbA="; + sha256_64bit = "sha256-c93CJSMPlGZgk+jhp9zTHCKSZ0LdnJu+ifLo+qMvIIk="; + openSha256 = "sha256-509KaBavGIOOpzdrdJuAR1PYq91Clwo8n+nhruxO1wM="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index ae08f59cc1ad6..e81f42b65a23e 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { wrapGAppsNoGuiHook python3.pkgs.wrapPython # checkInput but cheked for during the configuring - (python3.pythonForBuild.withPackages (ps: with ps; [ + (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ pygobject3 dbus-python python-dbusmock diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index af04476aa1d03..9c97377cfe04f 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,19 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, makeWrapper +, zsh +, coreutils +, cryptsetup +, e2fsprogs +, file +, gawk +, getent +, gettext +, gnugrep +, gnupg +, libargon2 +, lsof +, pinentry +, util-linux +, nix-update-script }: stdenv.mkDerivation rec { pname = "tomb"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { - owner = "dyne"; - repo = "Tomb"; - rev = "v${version}"; - sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; + owner = "dyne"; + repo = "Tomb"; + rev = "refs/tags/v${version}"; + hash = "sha256-lLxQJX0P6b6lbXEcrq45EsX9iKiayZ9XkhqgMfpN3/w="; }; - buildInputs = [ sudo zsh pinentry ]; + buildInputs = [ zsh pinentry ]; nativeBuildInputs = [ makeWrapper ]; @@ -23,22 +41,39 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - doInstallCheck = true; - installCheckPhase = "$out/bin/tomb -h"; - installPhase = '' - install -Dm755 tomb $out/bin/tomb + install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils + cryptsetup + e2fsprogs + file + gawk + getent + gettext + gnugrep + gnupg + libargon2 + lsof + pinentry + util-linux + ]} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "File encryption on GNU/Linux"; - homepage = "https://www.dyne.org/software/tomb/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + homepage = "https://www.dyne.org/software/tomb/"; + changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; + license = licenses.gpl3Only; + mainProgram = "tomb"; + maintainers = with maintainers; [ peterhoeg anthonyroussel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index ac9bdf70815d3..21904dc615a12 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ d-xo ]; + mainProgram = "bazarr"; platforms = platforms.all; }; } diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0c714cce59c04..5ff385cf65acb 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-Ch7cE+jyvWYfOeMWOH2UHiLeagO4p6L8Zi/fi5Quor4="; + sha256 = "sha256-TLgYBFjs+1KKPZo0uihEts0u1pyhxGHd4koOvWaCkUQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix index 88280cf518772..03814c365d7eb 100644 --- a/pkgs/servers/dns/trust-dns/default.nix +++ b/pkgs/servers/dns/trust-dns/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "trust-dns"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { - owner = "bluejekyll"; - repo = "trust-dns"; + owner = "hickory-dns"; + repo = "hickory-dns"; rev = "v${version}"; - sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY="; + hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE="; }; - cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM="; + cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; license = with licenses; [ asl20 mit ]; + mainProgram = "hickory-dns"; }; } diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py new file mode 100644 index 0000000000000..bbe9535824e72 --- /dev/null +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 + +import json +import importlib_metadata +import sys + +from packaging.requirements import Requirement + + +def check_requirement(req: str): + # https://packaging.pypa.io/en/stable/requirements.html + requirement = Requirement(req) + try: + version = importlib_metadata.distribution(requirement.name).version + except importlib_metadata.PackageNotFoundError: + print(f" - Dependency {requirement.name} is missing", file=sys.stderr) + return False + + # https://packaging.pypa.io/en/stable/specifiers.html + if not version in requirement.specifier: + print( + f" - {requirement.name}{requirement.specifier} expected, but got {version}", + file=sys.stderr, + ) + return False + + return True + + +def check_manifest(manifest_file: str): + with open(manifest_file) as fd: + manifest = json.load(fd) + if "requirements" in manifest: + ok = True + for requirement in manifest["requirements"]: + ok &= check_requirement(requirement) + if not ok: + print("Manifest requirements are not met", file=sys.stderr) + sys.exit(1) + + +if __name__ == "__main__": + if len(sys.argv) < 2: + raise RuntimeError(f"Usage {sys.argv[0]} <manifest>") + manifest_file = sys.argv[1] + check_manifest(manifest_file) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix new file mode 100644 index 0000000000000..05b7c2d4b0392 --- /dev/null +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -0,0 +1,38 @@ +{ lib +, home-assistant +, makeSetupHook +}: + +{ pname +, version +, format ? "other" +, ... +}@args: + +let + manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix { + inherit makeSetupHook; + inherit (home-assistant) python; + }; +in +home-assistant.python.pkgs.buildPythonPackage ( + { + inherit format; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r $src/custom_components/ $out/ + + runHook postInstall + ''; + + nativeCheckInputs = with home-assistant.python.pkgs; [ + importlib-metadata + manifestRequirementsCheckHook + packaging + ] ++ (args.nativeCheckInputs or []); + + } // builtins.removeAttrs args [ "nativeCheckInputs" ] +) diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix new file mode 100644 index 0000000000000..76317c9d0bc8d --- /dev/null +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -0,0 +1,11 @@ +{ python +, makeSetupHook +}: + +makeSetupHook { + name = "manifest-requirements-check-hook"; + substitutions = { + pythonCheckInterpreter = python.interpreter; + checkManifest = ./check_manifest.py; + }; +} ./manifest-requirements-check-hook.sh diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh new file mode 100644 index 0000000000000..74f29ca399ed0 --- /dev/null +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh @@ -0,0 +1,25 @@ +# Setup hook to check HA manifest requirements +echo "Sourcing manifest-requirements-check-hook" + +function manifestCheckPhase() { + echo "Executing manifestCheckPhase" + runHook preCheck + + manifests=$(shopt -s nullglob; echo $out/custom_components/*/manifest.json) + + if [ ! -z "$manifests" ]; then + echo Checking manifests $manifests + @pythonCheckInterpreter@ @checkManifest@ $manifests + else + echo "No custom component manifests found in $out" >&2 + exit 1 + fi + + runHook postCheck + echo "Finished executing manifestCheckPhase" +} + +if [ -z "${dontCheckManifest-}" ] && [ -z "${installCheckPhase-}" ]; then + echo "Using manifestCheckPhase" + preDistPhases+=" manifestCheckPhase" +fi diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 271ed97c857a5..7b856c0b25358 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,13 @@ # Do not edit! { - version = "2023.11.1"; + version = "2023.11.2"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ jaraco-abode + jaraco-functools ]; "accuweather" = ps: with ps; [ accuweather diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md new file mode 100644 index 0000000000000..a7244b25c173b --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -0,0 +1,57 @@ +# Packaging guidelines + +## buildHomeAssistantComponent + +Custom components should be packaged using the + `buildHomeAssistantComponent` function, that is provided at top-level. +It builds upon `buildPythonPackage` but uses a custom install and check +phase. + +Python runtime dependencies can be directly consumed as unqualified +function arguments. Pass them into `propagatedBuildInputs`, for them to +be available to Home Assistant. + +Out-of-tree components need to use python packages from +`home-assistant.python.pkgs` as to not introduce conflicting package +versions into the Python environment. + + +**Example Boilerplate:** + +```nix +{ lib +, buildHomeAssistantcomponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent { + # pname, version + + src = fetchFromGithub { + # owner, repo, rev, hash + }; + + propagatedBuildInputs = [ + # python requirements, as specified in manifest.json + ]; + + meta = with lib; { + # changelog, description, homepage, license, maintainers + } +} + +## Package name normalization + +Apply the same normalization rules as defined for python packages in +[PEP503](https://peps.python.org/pep-0503/#normalized-names). +The name should be lowercased and dots, underlines or multiple +dashes should all be replaced by a single dash. + +## Manifest check + +The `buildHomeAssistantComponent` builder uses a hook to check whether +the dependencies specified in the `manifest.json` are present and +inside the specified version range. + +There shouldn't be a need to disable this hook, but you can set +`dontCheckManifest` to `true` in the derivation to achieve that. diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix new file mode 100644 index 0000000000000..4a96b305964ae --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -0,0 +1,6 @@ +{ callPackage +}: + +{ + prometheus-sensor = callPackage ./prometheus-sensor {}; +} diff --git a/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix new file mode 100644 index 0000000000000..07bcd9abec1ca --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +}: + +buildHomeAssistantComponent rec { + pname = "prometheus-sensor"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mweinelt"; + repo = "ha-prometheus-sensor"; + rev = "refs/tags/${version}"; + hash = "sha256-10COLFXvmpm8ONLyx5c0yiQdtuP0SC2NKq/ZYHro9II="; + }; + + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/mweinelt/ha-prometheus-sensor/blob/${version}/CHANGELOG.md"; + description = "Import prometheus query results into Home Assistant"; + homepage = "https://github.com/mweinelt/ha-prometheus-sensor"; + maintainers = with maintainers; [ hexa ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/README.md b/pkgs/servers/home-assistant/custom-lovelace-modules/README.md new file mode 100644 index 0000000000000..b67fd0fb91d84 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/README.md @@ -0,0 +1,13 @@ +# Packaging guidelines + +## Entrypoint + +Every lovelace module has an entrypoint in the form of a `.js` file. By +default the nixos module will try to load `${pname}.js` when a module is +configured. + +The entrypoint used can be overridden in `passthru` like this: + +```nix +passthru.entrypoint = "demo-card-bundle.js"; +``` diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix new file mode 100644 index 0000000000000..4bb1e63b5f7f1 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -0,0 +1,8 @@ +{ callPackage +}: + +{ + mini-graph-card = callPackage ./mini-graph-card {}; + + mini-media-player = callPackage ./mini-media-player {}; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix new file mode 100644 index 0000000000000..60942d5f4ed23 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "mini-graph-card"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kalkih"; + repo = "mini-graph-card"; + rev = "refs/tags/v${version}"; + hash = "sha256-AC4VawRtWTeHbFqDJ6oQchvUu08b4F3ManiPPXpyGPc="; + }; + + npmDepsHash = "sha256-0ErOTkcCnMqMTsTkVL320SxZaET/izFj9GiNWC2tQtQ="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/mini-graph-card-bundle.js $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "mini-graph-card-bundle.js"; + + meta = with lib; { + changelog = "https://github.com/kalkih/mini-graph-card/releases/tag/v${version}"; + description = "Minimalistic graph card for Home Assistant Lovelace UI"; + homepage = "https://github.com/kalkih/mini-graph-card"; + maintainers = with maintainers; [ hexa ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix new file mode 100644 index 0000000000000..6945b18bde20b --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "mini-media-player"; + version = "1.16.5"; + + src = fetchFromGitHub { + owner = "kalkih"; + repo = "mini-media-player"; + rev = "v${version}"; + hash = "sha256-ydkY7Qx2GMh4CpvvBAQubJ7PlxSscDZRJayn82bOczM="; + }; + + npmDepsHash = "sha256-v9NvZOrQPMOoG3LKACnu79jKgZtcnGiopWad+dFbplw="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v ./dist/mini-media-player-bundle.js $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "mini-media-player-bundle.js"; + + meta = with lib; { + changelog = "https://github.com/kalkih/mini-media-player/releases/tag/v${version}"; + description = "Minimalistic media card for Home Assistant Lovelace UI"; + homepage = "https://github.com/kalkih/mini-media-player"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3fb3e244928ca..08d005313915c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,6 @@ , callPackage , fetchFromGitHub , fetchPypi -, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -183,6 +182,15 @@ let }; }); + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.9.6"; + src = fetchPypi { + pname = "psutil"; + inherit version; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; + }; + }); + py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { version = "2.1.4"; src = fetchFromGitHub { @@ -300,17 +308,6 @@ let doCheck = false; }); - # Pinned due to API changes in 0.3.0 - tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { - version = "0.2.0"; - src = fetchFromGitHub { - owner = "frenck"; - repo = "python-tailscale"; - rev = "refs/tags/v${version}"; - hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -356,7 +353,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.1"; + hassVersion = "2023.11.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -372,7 +369,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs="; + hash = "sha256-cnneRq0hIyvgKo0du/52ze0IVs8TgTPNQM3T1kyy03s="; }; # Secondary source is git for tests @@ -380,7 +377,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I="; + hash = "sha256-OljfYmlXSJVoWWsd4jcSF4nI/FXHqRA8e4LN5AaPVv8="; }; nativeBuildInputs = with python.pkgs; [ @@ -396,17 +393,14 @@ in python.pkgs.buildPythonApplication rec { # leave this in, so users don't have to constantly update their downstream patch handling patches = [ + # Follow symlinks in /var/lib/hass/www + ./patches/static-symlinks.patch + + # Patch path to ffmpeg binary (substituteAll { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) - (fetchpatch { - # freeze time in litterrobot tests - # https://github.com/home-assistant/core/pull/103444 - name = "home-assistant-litterrobot-freeze-test-time.patch"; - url = "https://github.com/home-assistant/core/commit/806205952ff863e2cf1875be406ea0254be5f13a.patch"; - hash = "sha256-OVbmJWy275nYWrif9awAGIYlgZqrRPcYBhB0Vil8rmk="; - }) ]; postPatch = let @@ -526,6 +520,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" # AssertionError: assert 2 == 1 "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" + # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" + "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ae2ef56244098..1c7bc02172b28 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20231030.1"; + version = "20231030.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-S363j7HnOxLqCBaml1Kb9xfY0AaqBIgj09NutByn6Xo="; + hash = "sha256-qzodzqWpAXZjwBJkiCyBi5zzfpEqqtauJn2PKZ5UtJ0="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 52d9f622c41bd..26fe812366d3a 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { postInstall = '' pushd intents # https://github.com/home-assistant/intents/blob/main/script/package#L18 - ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data + ${python.pythonOnBuildForHost.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data popd ''; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 1df4d98fb45d4..bb5e70994320b 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -56,6 +56,15 @@ EXTRA_COMPONENT_DEPS = { ], } +# Sometimes we have unstable versions for libraries that are not +# well-maintained. This allows us to mark our weird version as newer +# than a certain wanted version +OUR_VERSION_IS_NEWER_THAN = { + "blinkstick": "1.2.0", + "gps3": "0.33.3", + "pybluez": "0.22", +} + def run_sync(cmd: List[str]) -> None: @@ -226,7 +235,12 @@ def main() -> None: Version.parse(our_version) except InvalidVersion: print(f"Attribute {attr_name} has invalid version specifier {our_version}", file=sys.stderr) - attr_outdated = True + + # allow specifying that our unstable version is newer than some version + if newer_than_version := OUR_VERSION_IS_NEWER_THAN.get(attr_name): + attr_outdated = Version.parse(newer_than_version) < Version.parse(required_version) + else: + attr_outdated = True else: attr_outdated = Version.parse(our_version) < Version.parse(required_version) finally: diff --git a/pkgs/servers/home-assistant/patches/static-symlinks.patch b/pkgs/servers/home-assistant/patches/static-symlinks.patch new file mode 100644 index 0000000000000..7784a60f6b2a2 --- /dev/null +++ b/pkgs/servers/home-assistant/patches/static-symlinks.patch @@ -0,0 +1,37 @@ +diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py +index 2ec991750f..9a937006ce 100644 +--- a/homeassistant/components/frontend/__init__.py ++++ b/homeassistant/components/frontend/__init__.py +@@ -383,7 +383,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: + + local = hass.config.path("www") + if os.path.isdir(local): +- hass.http.register_static_path("/local", local, not is_dev) ++ hass.http.register_static_path("/local", local, not is_dev, follow_symlinks=True) + + # Can be removed in 2023 + hass.http.register_redirect("/config/server_control", "/developer-tools/yaml") +diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py +index 122b7b79ce..3cf2b7e0db 100644 +--- a/homeassistant/components/http/__init__.py ++++ b/homeassistant/components/http/__init__.py +@@ -411,16 +411,16 @@ class HomeAssistantHTTP: + ) + + def register_static_path( +- self, url_path: str, path: str, cache_headers: bool = True ++ self, url_path: str, path: str, cache_headers: bool = True, follow_symlinks: bool = False + ) -> None: + """Register a folder or file to serve as a static path.""" + if os.path.isdir(path): + if cache_headers: + resource: CachingStaticResource | web.StaticResource = ( +- CachingStaticResource(url_path, path) ++ CachingStaticResource(url_path, path, follow_symlinks=follow_symlinks) + ) + else: +- resource = web.StaticResource(url_path, path) ++ resource = web.StaticResource(url_path, path, follow_symlinks=follow_symlinks) + self.app.router.register_resource(resource) + self.app["allow_configured_cors"](resource) + return diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index d4c009fa258a7..b3652e734f192 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.11.1"; + version = "2023.11.2"; 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-eLmWOMKLzhZ7M/gdUHhlDZ3T+N4h5aHxMwOI8ZUepps="; + hash = "sha256-stVfFXb5QfC+wZUSk53+jt/hb8kO1gCcgeOnHHpNlWE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index ac49da29b5402..87b60d0682c54 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.121.5"; + version = "0.122.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-KEJh/JhTlSrio4JRQwxz8NbmjzaqW4MUlzAXGvanMmo="; + hash = "sha256-CgLMDztU5FRqYndNMsncJmc7B5pcBhoO58cVoLGERJM="; }; - vendorHash = "sha256-dBJsPv3tOWxLvVlkTG0npKalH2RWfwR3vJRjqb4TYQE="; + vendorHash = "sha256-rVzogKzURZWQSc8q9VRUKUe/eeo2R1YGbjUDUKm1fOI="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 9cdc0c58ee442..dd3648961439b 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , bzip2 , cmake , doxygen , fetchurl +, fetchpatch , fuse , libevent , xz @@ -23,6 +25,15 @@ stdenv.mkDerivation rec { sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533"; }; + patches = [ + # this patch fixes the build for glibc >= 2.38 + (fetchpatch { + name = "strlcpy-glibc238.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=0;bug=1052360;msg=10"; + hash = "sha256-uhQj+ZcHCV36Tm0pF/+JG59bSaRdTZCrMcKL3YhZTk8="; + }) + ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ]; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 3458da342ead8..2168d604c191d 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "3b219a4c7f932867f5a12608d8604436c722c1a0", - "sha256": "sha256-+uhq97H5frDbks9U0dQ0TK3VmtM71mlyFQzq0Dd2ZIc=", - "version": "unstable-2023-10-20" + "rev": "c5b87e3b5e5cc7f7f5c8baa7732bd6d81d8f910a", + "sha256": "sha256-aYxVgktwUBVfvUxgQUDUmDAKp1sr0+ZJcyGqcmBB4e0=", + "version": "unstable-2023-11-08" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 53050cfa7cc46..daad39ee1cfb6 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { homepage = "https://lidarr.audio/"; license = licenses.gpl3; maintainers = [ maintainers.etu ]; + mainProgram = "Lidarr"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 47d09bff6717b..955c553d8a74e 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - lazr_config + lazr-config passlib requests sqlalchemy diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index e4f96db0224d1..e5eb2251b5e1d 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -18,8 +18,6 @@ python3.override { [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ - django = super.django_3; - elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { version = "7.17.9"; src = fetchPypi { diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index 32a64f0a669df..aca863ed2da99 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.11"; + version = "0.99.12"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-Wd/nnJhKg+BDyOIz42zEScjzQRrpEq6YG9/9Tk24hgg="; + hash = "sha256-7M+Ti1SfurRngXg2oCdLveG6QyjM2BjKnoovJxz7ZOY="; }; - vendorHash = "sha256-0QSyYhOht1j1tWNxHQh+NUZA/W1xy7ANu+29H/gusOE="; + vendorHash = "sha256-li5kEF7U7KyyMLMhVBqvnLuLXI6QrJl1KeusKrQXo8w="; subPackages = [ "cmd/syncv3" ]; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 6221c467689fa..078125016bf0e 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -1,13 +1,12 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , gitUpdater , testers , cmake , pkg-config , python3 -, doxygen -, libxslt , boost , egl-wayland , freetype @@ -40,15 +39,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "mir"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${finalAttrs.version}"; - hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws="; + hash = "sha256-c1+gxzLEtNCjR/mx76O5QElQ8+AO4WsfcG7Wy1+nC6E="; }; + patches = [ + # Fix gbm-kms tests + # Remove when version > 2.15.0 + (fetchpatch { + name = "0001-mir-Fix-the-signature-of-drmModeCrtcSetGamma.patch"; + url = "https://github.com/MirServer/mir/commit/98250e9c32c5b9b940da2fb0a32d8139bbc68157.patch"; + hash = "sha256-tTtOHGNue5rsppOIQSfkOH5sVfFSn/KPGHmubNlRtLI="; + }) + ]; + postPatch = '' # Fix scripts that get run in tests patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in @@ -73,21 +82,13 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/platform/graphics/CMakeLists.txt \ --replace "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \ --replace "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" - - # Fix date in generated docs not honouring SOURCE_DATE_EPOCH - # Install docs to correct dir - substituteInPlace cmake/Doxygen.cmake \ - --replace '"date"' '"date" "--date=@'"$SOURCE_DATE_EPOCH"'"' \ - --replace "\''${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc" "\''${CMAKE_INSTALL_DOCDIR}" ''; strictDeps = true; nativeBuildInputs = [ cmake - doxygen glib # gdbus-codegen - libxslt lttng-ust # lttng-gen-tp pkg-config (python3.withPackages (ps: with ps; [ @@ -137,9 +138,8 @@ stdenv.mkDerivation (finalAttrs: { wlcs ]; - buildFlags = [ "all" "doc" ]; - cmakeFlags = [ + "-DBUILD_DOXYGEN=OFF" "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" "-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_RUNTIME_DIR=/tmp ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" ]; passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 39f1fd85f55b6..7a4707322b653 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -17,6 +17,10 @@ url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; }) + (fetchpatch { + url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch"; + sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ="; + }) ]; }; } diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index 5c2f5b3353ba7..c6707e62494b1 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -13,9 +13,9 @@ let version = "1.7.5"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe"; version = "${version}"; - sha256 = "05n33srckncg3f50nxzx3r05n8axiwb2c4p91snr8qm2vj5a7a92"; + sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -26,9 +26,9 @@ let version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe_phoenix"; version = "${version}"; - sha256 = "139gnamfbba5hyk1fx1zf8vfr0j17fd9q0vxxp9cf39qbj91hsfk"; + sha256 = "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"; }; beamDeps = [ absinthe absinthe_plug decimal phoenix phoenix_html phoenix_pubsub ]; @@ -39,9 +39,9 @@ let version = "1.5.8"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe_plug"; version = "${version}"; - sha256 = "0nkfk5gqbg8yvlysgxfcak7y4lsy8q2jfyqyhql5hwvvciv43c5v"; + sha256 = "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"; }; beamDeps = [ absinthe plug ]; @@ -52,9 +52,9 @@ let version = "3.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "argon2_elixir"; version = "${version}"; - sha256 = "142n65kcfsci052d0f7rzqzz0gg4xq7hgj7lzjsk0i9r2y1bf4x8"; + sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; }; beamDeps = [ comeonin elixir_make ]; @@ -65,9 +65,9 @@ let version = "0.5.1"; src = fetchHex { - pkg = "${name}"; + pkg = "atomex"; version = "${version}"; - sha256 = "0gxb379zfx5qk0ljxvy225iplxfvxbgfx470h8wm1f6abwdqjj32"; + sha256 = "6248891b5fcab8503982e090eedeeadb757a6311c2ef2e2998b874f7d319ab3f"; }; beamDeps = [ xml_builder ]; @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -91,9 +91,9 @@ let version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "1qp2r1f4hvpybhgi547p33ci7bh2w6xn6jl9il68xg4370vlxwpb"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8"; + sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"; }; beamDeps = []; @@ -117,9 +117,9 @@ let version = "2.12.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "077z80ijg0nfyslgdfl72c2wcfl76c7i1gmlrm040m9fy9fxhs7f"; + sha256 = "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"; }; beamDeps = []; @@ -130,9 +130,9 @@ let version = "2.24.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cldr_utils"; version = "${version}"; - sha256 = "101p43y2x6z6rd4ga5hr372z5y34rn3mm3j6pk84kf5m642k080q"; + sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"; }; beamDeps = [ castore certifi decimal ]; @@ -143,9 +143,9 @@ let version = "0.1.6"; src = fetchHex { - pkg = "${name}"; + pkg = "codepagex"; version = "${version}"; - sha256 = "0ndxsmalk70wqig1zzgl95g6mp2fb992y1l4y3nq3qnxjw84c88m"; + sha256 = "1521461097dde281edf084062f525a4edc6a5e49f4fd1f5ec41c9c4955d5bd59"; }; beamDeps = []; @@ -156,9 +156,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "5.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "1wgsa5p4lfs9v8chky6as0w7a6j8n0545f5pasfrj08dwnlr6qvr"; + sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; }; beamDeps = []; @@ -182,9 +182,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -195,9 +195,9 @@ let version = "3.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z"; + sha256 = "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"; }; beamDeps = [ plug ]; @@ -208,9 +208,9 @@ let version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -221,9 +221,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -234,9 +234,9 @@ let version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -247,9 +247,9 @@ let version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8"; + sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; }; beamDeps = [ bunt file_system jason ]; @@ -260,9 +260,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo_code_climate"; version = "${version}"; - sha256 = "1ji1d2qidnlz80pc3ql2ghwvhf1851c4fq0xh8ly5x2nh3irylkm"; + sha256 = "75529fe38056f4e229821d604758282838b8397c82e2c12e409fda16b16821ca"; }; beamDeps = [ credo jason ]; @@ -273,9 +273,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "dataloader"; version = "${version}"; - sha256 = "1w7ygm885fidf8i5q89ya1mg800dy0zqig6djpiidqkcny0igmh9"; + sha256 = "09d61781b76ce216e395cdbc883ff00d00f46a503e215c22722dba82507dfef0"; }; beamDeps = [ ecto telemetry ]; @@ -283,12 +283,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9"; + sha256 = "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"; }; beamDeps = [ telemetry ]; @@ -299,9 +299,9 @@ let version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -312,9 +312,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "dialyxir"; version = "${version}"; - sha256 = "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"; + sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"; }; beamDeps = [ erlex ]; @@ -325,9 +325,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "digital_token"; version = "${version}"; - sha256 = "1lf4vp5bdjz4hmm6zb0knqz8qm4jn3fwma540a5i46n6wwkdcm94"; + sha256 = "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"; }; beamDeps = [ cldr_utils jason ]; @@ -338,9 +338,9 @@ let version = "0.21.0"; src = fetchHex { - pkg = "${name}"; + pkg = "doctor"; version = "${version}"; - sha256 = "1q748x232m665qik23mb1rywp9267i0gmvfy9jr4wy3rm8fq69x2"; + sha256 = "a227831daa79784eb24cdeedfa403c46a4cb7d0eab0e31232ec654314447e4e0"; }; beamDeps = [ decimal ]; @@ -351,9 +351,9 @@ let version = "1.4.33"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid"; + sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"; }; beamDeps = []; @@ -364,9 +364,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -377,9 +377,9 @@ let version = "3.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4"; + sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; }; beamDeps = [ decimal jason telemetry ]; @@ -390,9 +390,9 @@ let version = "3.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_autoslug_field"; version = "${version}"; - sha256 = "1zyr5zlsi8zwc4q8gkhw324h43a46k4k558nbi5y4qsjh0addpdn"; + sha256 = "b6ddd614805263e24b5c169532c934440d0289181cce873061fca3a8e92fd9ff"; }; beamDeps = [ ecto slugify ]; @@ -403,9 +403,9 @@ let version = "0.9.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_dev_logger"; version = "${version}"; - sha256 = "1mf2068xqzv7dns2xyzl57cgm6hhbbdggvlni08cgz749a5wk2rf"; + sha256 = "2e8bc98b4ae4fcc7108896eef7da5a109afad829f4fb2eb46d677fdc9101c2d5"; }; beamDeps = [ ecto jason ]; @@ -416,9 +416,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -429,9 +429,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_shortuuid"; version = "${version}"; - sha256 = "0rgvivrvl504jgfh2yqgcd74ar3q1qbxxwzngrd2zsbbx1qknbmr"; + sha256 = "b92e3b71e86be92f5a7ef6f3de170e7864454e630f7b01dd930414baf38efb65"; }; beamDeps = [ ecto shortuuid ]; @@ -442,9 +442,9 @@ let version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "01whmapzs08xzachra73lhb0d8f7mvysz29qbqivjz55pkg1ih38"; + sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -455,9 +455,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_feed_parser"; version = "${version}"; - sha256 = "13x2rgckh41zkgbwg63wb7lvyy5xmn7vqq3i7nvy6virggz64g1d"; + sha256 = "2d3c62fe7b396ee3b73d7160bc8fadbd78bfe9597c98c7d79b3f1038d9cba28f"; }; beamDeps = [ timex ]; @@ -468,9 +468,9 @@ let version = "0.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "0v3y9i3bif14486dliwn9arwd0pcp4nv24gjwnxm5b8gjpzrzhav"; + sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; }; beamDeps = [ castore ]; @@ -481,9 +481,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "erlex"; version = "${version}"; - sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; }; beamDeps = []; @@ -494,9 +494,9 @@ let version = "0.11.0"; src = fetchHex { - pkg = "${name}"; + pkg = "erlport"; version = "${version}"; - sha256 = "1r7f0j12gnx65p6c86w035rjlzp1sa52ghyip0lx6j1rmz63dccf"; + sha256 = "8eb136ccaf3948d329b8d1c3278ad2e17e2a7319801bc4cc2da6db278204eee4"; }; beamDeps = []; @@ -507,9 +507,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -520,9 +520,9 @@ let version = "2.37.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr"; version = "${version}"; - sha256 = "1fljryh921whv90v6m1aax2rabybark3nw11cv76lwc0a0fpnin8"; + sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -533,9 +533,9 @@ let version = "1.22.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_calendars"; version = "${version}"; - sha256 = "0s812jkj4hf5274gp568syk3xp2d9228wwkn7gwjx2rix3cqqh77"; + sha256 = "e7408cd9e8318b2ef93b76728e84484ddc3ea6d7c894fbc811c54122a7140169"; }; beamDeps = [ ex_cldr_numbers ex_doc jason ]; @@ -546,9 +546,9 @@ let version = "2.15.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_currencies"; version = "${version}"; - sha256 = "1y3g1q0g7ygcajqzqh9kb1y3kchbarkrf89nssi7fs66jrik2885"; + sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"; }; beamDeps = [ ex_cldr jason ]; @@ -559,9 +559,9 @@ let version = "2.14.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_dates_times"; version = "${version}"; - sha256 = "155z81x9z0wwd4l32rbq2pc64rp6kmdz35vsvz1fqskgah08nnpq"; + sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94"; }; beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; @@ -572,9 +572,9 @@ let version = "0.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_languages"; version = "${version}"; - sha256 = "0yj4rj4r0wdzhrwkg1xdg1x28d1pp3kk8fr45n3v9d5pfbpizyr2"; + sha256 = "22fb1fef72b7b4b4872d243b34e7b83734247a78ad87377986bf719089cc447a"; }; beamDeps = [ ex_cldr jason ]; @@ -585,9 +585,9 @@ let version = "2.32.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "0jjh9a5w5ybvzpxpvia3kgig50h259yjgfbbhnsmcnv0p0k3ri08"; + sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -598,9 +598,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_plugs"; version = "${version}"; - sha256 = "1zwbhpj9cxr2bl16cn5539hslj8gqi0q0xmfky27qjm17ra9i6k9"; + sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff"; }; beamDeps = [ ex_cldr gettext jason plug ]; @@ -611,9 +611,9 @@ let version = "0.30.6"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "17qhflrr5mrbavcw7pg6xabib270k2a3sagr4z3q5r7lmkfz4j5x"; + sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -624,9 +624,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_ical"; version = "${version}"; - sha256 = "1yxyflmkvmglks7whmbz944kyq6qljjpki666dk9w9g058xlfxnv"; + sha256 = "db76473b2ae0259e6633c6c479a5a4d8603f09497f55c88f9ef4d53d2b75befb"; }; beamDeps = [ timex ]; @@ -637,9 +637,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -650,9 +650,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_optimizer"; version = "${version}"; - sha256 = "11i2npj15w3a91lxdpf9ll7lpdv99zf7y9bg5yz6d2ympicw1xg6"; + sha256 = "e6f5c059bcd58b66be2f6f257fdc4f69b74b0fa5c9ddd669486af012e4b52286"; }; beamDeps = [ file_info ]; @@ -663,9 +663,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_unit_notifier"; version = "${version}"; - sha256 = "0rf3b2cb4fqsg0hgas9axr8p5p471ainzc788ky65ng8c9hgvzsm"; + sha256 = "55fffd6062e8d962fc44e8b06fa30a87dc7251ee2a69f520781a3bb29858c365"; }; beamDeps = []; @@ -676,9 +676,9 @@ let version = "0.17.1"; src = fetchHex { - pkg = "${name}"; + pkg = "excoveralls"; version = "${version}"; - sha256 = "1q2sk1kha63hyp03wf3m9r30aqikh241jjns2h7wd11yjpd6zg4m"; + sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0"; }; beamDeps = [ castore jason ]; @@ -689,9 +689,9 @@ let version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "exgravatar"; version = "${version}"; - sha256 = "1q80jcrnagivsjr9mz0z9h4bwlf0xyyx6ijl7szd74c9ppwqz8dc"; + sha256 = "aca18ff9bd8991d3be3e5446d3bdefc051be084c1ffc9ab2d43b3e65339300e1"; }; beamDeps = []; @@ -702,9 +702,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "expo"; version = "${version}"; - sha256 = "0idzpg3bc9ady0lqrkxs6y0x9daffjsapppfm9cf0vf545h56b62"; + sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45"; }; beamDeps = []; @@ -715,9 +715,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "export"; version = "${version}"; - sha256 = "07q2l7f9yr3bd3xqc5q1qa9qrhnjzc9xnjrg6lj1hgq5yi7l99rx"; + sha256 = "3da7444ff4053f1824352f4bdb13fbd2c28c93c2011786fb686b649fdca1021f"; }; beamDeps = [ erlport ]; @@ -728,9 +728,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06"; + sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -741,9 +741,9 @@ let version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "1qjnbs63q0d95dqhh2r9sz3zpg2y4hjy23kxsqanwf6h21njibg8"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -754,9 +754,9 @@ let version = "0.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "file_info"; version = "${version}"; - sha256 = "19c14xv0xzbl3m6y5p7dlxn8sfqi9bff8pv722837ff8q80svrsh"; + sha256 = "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"; }; beamDeps = [ mimetype_parser ]; @@ -767,9 +767,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -780,9 +780,9 @@ let version = "0.34.3"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm"; + sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; }; beamDeps = []; @@ -793,9 +793,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y"; + sha256 = "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"; }; beamDeps = [ ranch ]; @@ -803,12 +803,12 @@ let geo = buildMix rec { name = "geo"; - version = "3.5.1"; + version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geo"; version = "${version}"; - sha256 = "175mqwzdn4jkwxkklc3k97pbnc4mxjfsw49cld92nh0lyb2zsp66"; + sha256 = "1dbdebf617183b54bc3c8ad7a36531a9a76ada8ca93f75f573b0ae94006168da"; }; beamDeps = [ jason ]; @@ -816,15 +816,15 @@ let geo_postgis = buildMix rec { name = "geo_postgis"; - version = "3.4.3"; + version = "3.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geo_postgis"; version = "${version}"; - sha256 = "1p7pdwrfbg244n50lhv27xbkmvgfi47y71nwbggzj5v469j36zc2"; + sha256 = "0bebc5b00f8b11835066bd6213fbeeec03704b4a1c206920b81c1ec2201d185f"; }; - beamDeps = [ geo jason postgrex ]; + beamDeps = [ ecto geo jason postgrex ]; }; geohax = buildMix rec { @@ -832,9 +832,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geohax"; version = "${version}"; - sha256 = "0912z8fn86r7sxgbvhmzfqvbxc96v5awklhmqrkwnfi10pwz4gl9"; + sha256 = "893ef2f905213acb67c615d2c955d926b1be3676bfc2bd5ed7271b641dfa2224"; }; beamDeps = []; @@ -845,9 +845,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geolix"; version = "${version}"; - sha256 = "1pq1qcjaqsnnvsbgzzbfdj290n9mkp808cj45kppvfyhircbyhl7"; + sha256 = "8742bf588ed0bb7def2c443204d09d355990846c6efdff96ded66aac24c301df"; }; beamDeps = []; @@ -858,9 +858,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geolix_adapter_mmdb2"; version = "${version}"; - sha256 = "16r6q2qmgdpj5pvb36s3rgfd1qm6rnzp8szqzp7i18z8x8prdzq6"; + sha256 = "06ff962feae8a310cffdf86b74bfcda6e2d0dccb439bb1f62df2b657b1c0269b"; }; beamDeps = [ geolix mmdb2_decoder ]; @@ -871,9 +871,9 @@ let version = "0.20.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gettext"; version = "${version}"; - sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw"; + sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"; }; beamDeps = []; @@ -884,9 +884,9 @@ let version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian"; version = "${version}"; - sha256 = "1hvl8ajr49f8lv2b79dbi33bn016kl2dchmd2vczl28vrbwl3qmv"; + sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3"; }; beamDeps = [ jose plug ]; @@ -897,9 +897,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian_db"; version = "${version}"; - sha256 = "0w0d9bwsiz7hw9i7b3v8gpjsvblzhbkcnnpxlzrrbhwjmi1xbrzq"; + sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70"; }; beamDeps = [ ecto ecto_sql guardian postgrex ]; @@ -910,9 +910,9 @@ let version = "2.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian_phoenix"; version = "${version}"; - sha256 = "1350z7sk4m8n2wxllnjm07gzpm8ybm3811i23wijn68mcwj3kx11"; + sha256 = "21f439246715192b231f228680465d1ed5fbdf01555a4a3b17165532f5f9a08c"; }; beamDeps = [ guardian phoenix ]; @@ -923,9 +923,9 @@ let version = "1.18.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "1zb59ghnlmlqcxkcr9caj7sbdv16ah7a394hf0jxnmvqz74xb55g"; + sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -936,9 +936,9 @@ let version = "6.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "hammer"; version = "${version}"; - sha256 = "0mxsd2psl3qddgflq17r5hc432hd15ccvayyj8ihfv9aard42zml"; + sha256 = "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"; }; beamDeps = [ poolboy ]; @@ -949,9 +949,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "haversine"; version = "${version}"; - sha256 = "0q3hc16zd5pvz9xvhk5692v1fkk3fg42cw536yaaa65wjpl4ip2l"; + sha256 = "54dc48e895bc18a59437a37026c873634e17b648a64cb87bfafb96f64d607060"; }; beamDeps = []; @@ -962,9 +962,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -975,9 +975,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "http_signatures"; version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; }; beamDeps = []; @@ -988,9 +988,9 @@ let version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "08crb48yz7r7w00pzw9gfk862g99z2ma2x6awab0rqvjd7951crb"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -1001,9 +1001,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -1014,9 +1014,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -1027,9 +1027,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ip_reserved"; version = "${version}"; - sha256 = "1zm4820yvdashvz14p9jhv2bwc1hshvyym1zx84yzjhiwavd5z2m"; + sha256 = "55fcd2b6e211caef09ea3f54ef37d43030bec486325d12fe865ab5ed8140a4fe"; }; beamDeps = [ inet_cidr ]; @@ -1040,9 +1040,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"; + sha256 = "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"; }; beamDeps = [ decimal ]; @@ -1053,9 +1053,9 @@ let version = "1.11.6"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2"; + sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; }; beamDeps = []; @@ -1066,9 +1066,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "1qb5y4i88d7nxar69an171m9fqpb6rpy4w42q2rimq11j1084xwv"; + sha256 = "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"; }; beamDeps = []; @@ -1079,9 +1079,9 @@ let version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "junit_formatter"; version = "${version}"; - sha256 = "0ax79m9fn7asbfjk523vvawnvbn2nbhgvnm6j6xdh5ac9fzca7vn"; + sha256 = "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"; }; beamDeps = []; @@ -1092,9 +1092,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "linkify"; version = "${version}"; - sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; + sha256 = "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"; }; beamDeps = []; @@ -1105,9 +1105,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"; + sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"; }; beamDeps = [ nimble_parsec ]; @@ -1118,9 +1118,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1"; + sha256 = "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"; }; beamDeps = [ makeup nimble_parsec ]; @@ -1131,9 +1131,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk"; + sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; }; beamDeps = [ makeup ]; @@ -1144,9 +1144,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -1157,9 +1157,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -1170,9 +1170,9 @@ let version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "0p50h0ki8ay5sraiqxiajgwy1829bvyagj65bj9wjny4cnin83fs"; + sha256 = "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"; }; beamDeps = []; @@ -1183,9 +1183,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -1196,9 +1196,9 @@ let version = "0.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mimetype_parser"; version = "${version}"; - sha256 = "0lm8yzcmg17nhvr4p4dbmamb280a9dzqx4rwv66ffz40cz2q13vx"; + sha256 = "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"; }; beamDeps = []; @@ -1209,9 +1209,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mix_test_watch"; version = "${version}"; - sha256 = "1bmswsjcngjj4rsp67wzhi4p69n32lp8j8qp09kk8lzf9nsn48pq"; + sha256 = "f82262b54dee533467021723892e15c3267349849f1f737526523ecba4e6baae"; }; beamDeps = [ file_system ]; @@ -1222,9 +1222,9 @@ let version = "3.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mmdb2_decoder"; version = "${version}"; - sha256 = "17amvw553l6drkaszc5xpf8rcz4fwzpm8kwl5mw29j7si3rz0sii"; + sha256 = "316af0f388fac824782d944f54efe78e7c9691bbbdb0afd5cccdd0510adf559d"; }; beamDeps = []; @@ -1235,9 +1235,9 @@ let version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -1248,9 +1248,9 @@ let version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -1261,9 +1261,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1wpyh6wp76lyx0q2cys23rpmci4gj1pqwnqvfk467xxanchlk1pr"; + sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; }; beamDeps = []; @@ -1274,9 +1274,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_csv"; version = "${version}"; - sha256 = "0amij6y3pgkpazhjr3madrn9c9lv6malq11ln1w82562zhbq2qnh"; + sha256 = "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"; }; beamDeps = []; @@ -1287,9 +1287,9 @@ let version = "1.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"; + sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"; }; beamDeps = []; @@ -1300,9 +1300,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "1c715055095d3f2705c4e236c18b618420a35490da94149ff8b580a2144f653f"; }; beamDeps = []; @@ -1313,9 +1313,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "oauth2"; version = "${version}"; - sha256 = "0h9bps7gq7bac5gc3q0cgpsj46qnchpqbv5hzsnd2z9hnf2pzh4a"; + sha256 = "8ac07f85b3307dd1acfeb0ec852f64161b22f57d0ce0c15e616a1dfc8ebe2b41"; }; beamDeps = [ tesla ]; @@ -1326,9 +1326,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "oauther"; version = "${version}"; - sha256 = "0kn0msy3z0rx7l4pp8zc5r7yhvmwa3sscr08gfi2rivmm278isvq"; + sha256 = "78eb888ea875c72ca27b0864a6f550bc6ee84f2eeca37b093d3d833fbcaec04e"; }; beamDeps = []; @@ -1339,9 +1339,9 @@ let version = "2.15.4"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "1707222miq6di3605cqyfcgdy6i0wlb3326z928kxcgzvwgn3kjz"; + sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1352,9 +1352,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "paasaa"; version = "${version}"; - sha256 = "0blzqack3i8w1f0hjqjgsybqjazcyf54dv3anbnk225c3g1dybbk"; + sha256 = "732ddfc21bac0831edb26aec468af3ec2b8997d74f6209810b1cc53199c29f2e"; }; beamDeps = []; @@ -1365,9 +1365,9 @@ let version = "3.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "16p4c2xjrvz16kzpr9pmcvi6nxq6rwckqi9fp0ksibaxwxn402k2"; + sha256 = "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"; }; beamDeps = []; @@ -1378,9 +1378,9 @@ let version = "1.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "119h8lcvarlm7xrlrb301wgrd3plwwmbvl3f3dckfpjy75ff2rl9"; + sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1391,9 +1391,9 @@ let version = "4.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h"; + sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1404,9 +1404,9 @@ let version = "3.3.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "07d1x5nyk9qahqhyc7785774cyfwm07nnjr8kpxj073wcs7azba4"; + sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"; }; beamDeps = [ plug ]; @@ -1417,9 +1417,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_reload"; version = "${version}"; - sha256 = "1aqm6sxy4ijd5gi8lmjmcaxal1smg2smibjlzrkq9w6xwwsbizwv"; + sha256 = "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"; }; beamDeps = [ file_system phoenix ]; @@ -1430,9 +1430,9 @@ let version = "0.19.5"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "1lx9gi70a3cabjnjhslqbs8ysnpjz5yj324vjkxxg6zv7kfs1smj"; + sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1443,9 +1443,9 @@ let version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1456,9 +1456,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1469,9 +1469,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n"; + sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; }; beamDeps = [ phoenix_html ]; @@ -1482,9 +1482,9 @@ let version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "0vykabqxyk08gkfm45zy5dnlnzygwx6g9z4z2h7fxix51qiyfad9"; + sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1495,9 +1495,9 @@ let version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "04wdyv6nma74bj1m49vkm2bc5mjf8zclfg957fng8g71hw0wabw4"; + sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1508,9 +1508,9 @@ let version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "04v6xc4v741dr2y38j66fmcc4xc037dnaxzkj2vih6j53yif2dny"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1521,9 +1521,9 @@ let version = "1.2.5"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "0hnqgzc3zas7j7wycgnkkdhaji5farkqccy2n4p1gqj5ccfrlm16"; + sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; }; beamDeps = []; @@ -1534,9 +1534,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1547,9 +1547,9 @@ let version = "0.17.3"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "1389zgxvv90nzz0nwb7l5l4gyg2hldmyg2s4h5xcmzd46mlz8v4l"; + sha256 = "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"; }; beamDeps = [ db_connection decimal jason ]; @@ -1560,9 +1560,9 @@ let version = "3.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "progress_bar"; version = "${version}"; - sha256 = "1dzj622nf3drhswlvqia3b19j4wfclindi1d3b4yqjmjbarc50b9"; + sha256 = "6981c2b25ab24aecc91a2dc46623658e1399c21a2ae24db986b90d678530f2b7"; }; beamDeps = [ decimal ]; @@ -1573,9 +1573,9 @@ let version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1586,9 +1586,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "remote_ip"; version = "${version}"; - sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; + sha256 = "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"; }; beamDeps = [ combine plug ]; @@ -1599,9 +1599,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "replug"; version = "${version}"; - sha256 = "0q7sikahnvmr8jw9ziklh2am73h9cilhq1j697z59s24x5bpl7zp"; + sha256 = "f71f7a57e944e854fe4946060c6964098e53958074c69fb844b96e0bd58cfa60"; }; beamDeps = [ plug ]; @@ -1612,9 +1612,9 @@ let version = "8.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sentry"; version = "${version}"; - sha256 = "1d0sd34ckmnkx60zfqvwb7gf37cbjk166nay1x8qbs31xx0pdz7r"; + sha256 = "f9fc7641ef61e885510f5e5963c2948b9de1de597c63f781e9d3d6c9c8681ab4"; }; beamDeps = [ hackney jason plug plug_cowboy ]; @@ -1625,9 +1625,9 @@ let version = "3.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "shortuuid"; version = "${version}"; - sha256 = "0f8dkll158j48jlynjkdrjc6vw72sv04lgxq5ii93fsca47zin6z"; + sha256 = "dfd8f80f514cbb91622cb83f4ac0d6e2f06d98cc6d4aeba94444a212289d0d39"; }; beamDeps = []; @@ -1638,9 +1638,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sitemapper"; version = "${version}"; - sha256 = "0gr23zpwih1z2hycpbxgjnlvpg721f5z8savmh87zzp9wn2adxv0"; + sha256 = "60f7a684e5e9fe7f10ac5b69f48b0be2bcbba995afafcb3c143fc0c8ef1f223f"; }; beamDeps = [ xml_builder ]; @@ -1651,9 +1651,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "19argym7xifhsbrp21glkgs0dz1xpd00yfhsbhqdd0dpqm4d1rcz"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1664,9 +1664,9 @@ let version = "0.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "slugger"; version = "${version}"; - sha256 = "1fmgnl4ydq4ivbfk1a934vcn0d0wb24lhnvcmqg5sq0jwz8dxl10"; + sha256 = "20d0ded0e712605d1eae6c5b4889581c3460d92623a930ddda91e0e609b5afba"; }; beamDeps = []; @@ -1677,9 +1677,9 @@ let version = "1.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "slugify"; version = "${version}"; - sha256 = "0xmyv324a5prnzj20y1j1nkn18rki7cq3ri567d15csnn2z0n2fb"; + sha256 = "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"; }; beamDeps = []; @@ -1690,9 +1690,9 @@ let version = "0.13.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sobelow"; version = "${version}"; - sha256 = "03aawfxpxb567dxhka8737fxjy50hmggj56s55smvhszp0k90vnd"; + sha256 = "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"; }; beamDeps = [ jason ]; @@ -1703,9 +1703,9 @@ let version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; }; beamDeps = []; @@ -1716,9 +1716,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "struct_access"; version = "${version}"; - sha256 = "0sjq5v0zdqx7iqs0hqa7lfqzxf4jzi8rb409aywq2q12q3f13i74"; + sha256 = "e4c411dcc0226081b95709909551fc92b8feb1a3476108348ea7e3f6c12e586a"; }; beamDeps = []; @@ -1729,9 +1729,9 @@ let version = "0.7.4"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "0rx1xgdy4y9j8isnd2gnf2hz3vc7zrafy7cm6j194326pyyv1i77"; + sha256 = "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"; }; beamDeps = []; @@ -1742,9 +1742,9 @@ let version = "1.11.5"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "0h00h0ml8s6ca72ihq1bn4dj4aqldpapc7p1pg9mcbwdsvf5gvi1"; + sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040"; }; beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; @@ -1755,9 +1755,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs"; + sha256 = "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"; }; beamDeps = []; @@ -1768,9 +1768,9 @@ let version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f"; + sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"; }; beamDeps = [ castore hackney jason mime telemetry ]; @@ -1781,9 +1781,9 @@ let version = "3.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1anijimbrb3ngdy6fdspr8c9hz6dip7nakx0gayzkfmsxzvj944b"; + sha256 = "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"; }; beamDeps = [ combine gettext tzdata ]; @@ -1794,9 +1794,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tz_world"; version = "${version}"; - sha256 = "140kip660zbfxpckzi2y4mxg1pysvwcr2cc68viqrd4r12m6bdbq"; + sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390"; }; beamDeps = [ castore certifi geo jason ]; @@ -1807,9 +1807,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "11wpm1mjla8hbkb5mssprg3gsq1v24s8m8nyk3hx5z7aaa1yr756"; + sha256 = "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"; }; beamDeps = [ hackney ]; @@ -1820,9 +1820,9 @@ let version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "1qf97azn8064ymawfm58p2bqpmrigipr4fs5xp3jb8chshqizz9y"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1833,9 +1833,9 @@ let version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_cas"; version = "${version}"; - sha256 = "08g3kdcx2zxv963nqvwspsh1pqiiclx4hrwsm82jyz11kqmsws2h"; + sha256 = "5068ae2b9e217c2f05aa9a67483a6531e21ba0be9a6f6c8749bb7fd1599be321"; }; beamDeps = [ httpoison sweet_xml ueberauth ]; @@ -1846,9 +1846,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_discord"; version = "${version}"; - sha256 = "1d4nk3hshwj1ybr5ywz95m6qrrp0f2jcnyjbvbmdqkdv3bwqxyfn"; + sha256 = "d6f98ef91abb4ddceada4b7acba470e0e68c4d2de9735ff2f24172a8e19896b4"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1859,9 +1859,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_facebook"; version = "${version}"; - sha256 = "1a1pjlxa86v5kbqsxb7lcggbs45pq6380zpppy5dll0wdgbfb35z"; + sha256 = "bf8ce5d66b1c50da8abff77e8086c1b710bdde63f4acaef19a651ba43a9537a8"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1872,9 +1872,9 @@ let version = "0.8.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_github"; version = "${version}"; - sha256 = "1iiw953l4mk087r2jrpcnyqdmgv2n8cq5947f8fsbkrjkj3v42mf"; + sha256 = "ae0ab2879c32cfa51d7287a48219b262bfdab0b7ec6629f24160564247493cc6"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1885,9 +1885,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_gitlab_strategy"; version = "${version}"; - sha256 = "07h94s9fy46mqkn4g3wd62lkpgpjfcdk1cd60myc0qxh9dwjwvp8"; + sha256 = "e86e2e794bb063c07c05a6b1301b73f2be3ba9308d8f47ecc4d510ef9226091e"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1898,9 +1898,9 @@ let version = "0.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_google"; version = "${version}"; - sha256 = "0f005491i5jbhx76p7xshcpjcgjf0afqd4c6fgh3djdcaabclqi4"; + sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1911,9 +1911,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_keycloak_strategy"; version = "${version}"; - sha256 = "06r10w0azlpypjgggar1lf7h2yazn2dpyicy97zxkjyxgf9jfc60"; + sha256 = "c03027937bddcbd9ff499e457f9bb05f79018fa321abf79ebcfed2af0007211b"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1924,9 +1924,9 @@ let version = "0.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_twitter"; version = "${version}"; - sha256 = "0rb0n41s60b89385ggzvags3mxgbp4iv7gxympqpdyd3w6iqxjl3"; + sha256 = "83ca8ea3e1a3f976f1adbebfb323b9ebf53af453fbbf57d0486801a303b16065"; }; beamDeps = [ httpoison oauther ueberauth ]; @@ -1937,9 +1937,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1950,9 +1950,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unplug"; version = "${version}"; - sha256 = "0fkwkg6qm2lsvil8xdba9mmcgi5iw41w42dqhm72shdab1bshwfi"; + sha256 = "d171a85758aa412d4e85b809c203e1b1c4c76a4d6ab58e68dc9a8a8acd9b7c3a"; }; beamDeps = [ plug ]; @@ -1963,9 +1963,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "0xgn5mfbi4c7yv33k11mhyxz7ijjy5wlmjs4rnlh3ay3hcb271dl"; + sha256 = "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"; }; beamDeps = []; @@ -1976,9 +1976,9 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "vite_phx"; version = "${version}"; - sha256 = "0dn9bygcsjyxllw2cxm9iggmqjyx9i67dix2y07ljcd1jih75c88"; + sha256 = "08b1726094a131490ff0a2c7764c4cdd4b5cdf8ba9762638a5dd4bcd9e5fc936"; }; beamDeps = [ jason phoenix ]; @@ -1989,9 +1989,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websock"; version = "${version}"; - sha256 = "0lxlp1h18595nqczfg15iy34kw5xbbab3yk6ml9cf8mcgwyla1b1"; + sha256 = "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"; }; beamDeps = []; @@ -2002,9 +2002,9 @@ let version = "0.5.4"; src = fetchHex { - pkg = "${name}"; + pkg = "websock_adapter"; version = "${version}"; - sha256 = "1azlnjpndkhz4h78fcz9p4ssf1shpfh2rqnszhiy5jsjkk3kihnj"; + sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"; }; beamDeps = [ plug plug_cowboy websock ]; @@ -2015,9 +2015,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "xml_builder"; version = "${version}"; - sha256 = "1jb29bv6hgz7z2bdw119am6z17nkg1033936h4smsmhpp4pxarlx"; + sha256 = "9d66d52fb917565d358166a4314078d39ef04d552904de96f8e73f68f64a62c9"; }; beamDeps = []; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 91c595a8255d2..a970b998065a2 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.37.3"; + version = "0.37.4"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-mu1kkC6bfsUIdDdMC5s6F+YN7dc+pwaZ+9hHHNl5nj4="; + hash = "sha256-wR5Xexebe6LB15hKQwFtVjyTZPFmvuyozji9BmxuZ/g="; }; vendorHash = "sha256-emtSRn/xT9RSEdGrkfaa+IuP5yF+tVLP1j+bzOoNHXg="; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index edf82742bc53e..6f357ccb08c85 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,19 +1,47 @@ -{ lib, stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, perl +, php +, gd +, libpng +, openssl +, zlib +, unzip +, nixosTests +, nix-update-script +}: stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.6"; + version = "4.4.14"; - src = fetchurl { - url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; + src = fetchFromGitHub { + owner = "NagiosEnterprises"; + repo = "nagioscore"; + rev = "refs/tags/nagios-${version}"; + hash = "sha256-EJKMgU3Nzfefq2VXxBrfDDrQZWZvj7HqKnWR9j75fGI="; }; patches = [ ./nagios.patch ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ php perl gd libpng zlib ]; - configureFlags = [ "--localstatedir=/var/lib/nagios" ]; + buildInputs = [ + php + perl + gd + libpng + openssl + zlib + ]; + + configureFlags = [ + "--localstatedir=/var/lib/nagios" + "--with-ssl=${openssl.dev}" + "--with-ssl-inc=${openssl.dev}/include" + "--with-ssl-lib=${lib.getLib openssl}/lib" + ]; + buildFlags = [ "all" ]; # Do not create /var directories @@ -28,15 +56,22 @@ stdenv.mkDerivation rec { sed -i 's@/bin/@@g' $out/etc/objects/commands.cfg ''; - passthru.tests = { - inherit (nixosTests) nagios; + passthru = { + tests = { + inherit (nixosTests) nagios; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "nagios-(.*)" ]; + }; }; meta = { description = "A host, service and network monitoring program"; - homepage = "https://www.nagios.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ immae thoughtpolice relrod ]; + homepage = "https://www.nagios.org/"; + changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${version}/Changelog"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + mainProgram = "nagios"; + maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 74bd2f1395080..cc87fd0d7633d 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.7"; + version = "0.5.2"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aSygfs5jVc1CTb+uj16U//99ypP4kixz7gqDvxIxxfM="; + sha256 = "sha256-TkTxmumL7T8stNPWkVrMdB23jjMyQcv2x9F+rK6Vj6E="; }; vendorHash = null; diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/servers/networking/rustus/default.nix index b399c3b841770..651ed424fc5f0 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/servers/networking/rustus/default.nix @@ -10,7 +10,7 @@ let pname = "rustus"; - version = "0.7.4"; + version = "0.7.6"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "s3rius"; repo = pname; rev = version; - hash = "sha256-RmtkGemFGqvDYd+om/2o4Ki3NWKjJ4/cJ0z40J+L+SY="; + hash = "sha256-osxdqwNUONCScFarpQV48C7CR1DVR/mCttaglqiAKPo="; }; - cargoHash = "sha256-Ayki+hJTyaITOZhiyY8X6d5tR3+CLHZe94zJ9d/Kn4I="; + cargoHash = "sha256-M0mJ+9VznzHDmdKAsT3YamyG/P0JF8oPeVHaX44NWM4="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index f68fe3969b219..7c46ba3461430 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-QXs42HY2h/s2cT1pG2QjSV2HVAjpo2WSymXEYGgF8rI="; + sha256 = "sha256-4GYte9kPUR4kFHrUzHXtiMGbuRhZ+4iw1hmqi+geljc="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 16a4ccef56081..05fed1ac92043 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -6,8 +6,8 @@ let }; variants = if stdenv.isLinux then { - version = "5.0.21"; - sha256 = "sha256-knAqb6bT1KpO1Gi4sKhG22OtCPhOR3NMmhRjUgseUPM="; + version = "5.0.22"; + sha256 = "sha256-NIsx6nwXGsuk+ff+LOCwOMpT/HAaNn89t4jtJvKprIA="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } else lib.optionalAttrs stdenv.isDarwin diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 12110393f9bc3..8d7d6fbe78f64 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "6.0.10"; - sha256 = "sha256-7YJ0Ndyl635ebDWuIGfC5DFIGUXr518ghC/0Qq42HEM="; + version = "6.0.11"; + sha256 = "sha256-hIbbCDQ0Sqnm6ohtEpbdGWk18nLIlr6T0T9UL6WAFA8="; patches = [ (fetchpatch { name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch"; diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 2b5b34eb3de9d..ea5a35eeb78ff 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-60S8M1Y9BxuMxXGxEaxW82Va5lSnZZPfQnPq2ivTXdU="; + sha256 = "sha256-0rtxKSVIyCzYnhRneLOEu1e1qtAO6dGBAUr/oKq95Hw="; }; preferLocalBuild = true; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 3af259d0e7264..04db11a9a5ae4 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -32,6 +32,69 @@ stdenv.mkDerivation { version = "${version}-${kernel.modDirVersion}"; inherit src; + patches = [ + # cf: Fix cast-function-type err w/disable-checking + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6867a3e8429f37fb748575df52256227ae9e5b53"; + hash = "sha256-FDvOFDzl2eFN7ZKUqQBQSWGo0ntayc8NCYh/haVi8Ng="; + }) + # LINUX: Make 'fs flush*' invalidate dentry + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=898098e01e19970f80f60a0551252b2027246038"; + hash = "sha256-ehwRrzpqB8iJKuZ/18oJsrHVlKQs6EzCNaPtSG1m0sw="; + }) + # Linux 6.5: Replace generic_file_splice_read + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=fef245769366efe8694ddadd1e1f2ed5ef8608f4"; + hash = "sha256-TD1xYvlc9aJyravNZLPhceeOwBawvn0Ndxd50rszTJU="; + }) + # LINUX: Make sysctl definitions more concise + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=d15c7ab50c92671052cbe9a93b0440c81156d8aa"; + hash = "sha256-6K593AJvgC34RfnIqW8+0A/v9cF6tsbVMeKpCv+QrK4="; + }) + # Linux 6.5: Use register_sysctl() + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=63801cfd1fc06ec3259fcfd67229f3a3c70447ed"; + hash = "sha256-eoQxaZ28OanSoaHRJcfvXQORbe21YLhwPLoJUILjMkU="; + }) + # hcrypto: rename abort to _afscrypto_abort + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=538f450033a67e251b473ff92238b3124b85fc72"; + hash = "sha256-ztfJQKvGHGdWQe/0+BGkgRFxOi3n4YY+EFxgbD3DO1E="; + }) + # cf: Avoid nested C functions built by autoconf + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=d50ced2a17e05884ea18bb3dfcde6378b2531dc7"; + hash = "sha256-dK2/9bGhlXCPCB9t9T/K2dKdRBShVKXtYXWPttsOhAM="; + }) + # cf: Use static allocated structs for cf tests + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=00f13c45d637249a0d698458e08c1b8e2da8e219"; + hash = "sha256-YNszJIxBDIsl3RgBcHEpNtYIrNLC0tnSbIOQvX0oZ+s="; + }) + # LINUX: Pass an array of structs to register_sysctl + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=5b647bf17a878271e1ce9882e41663770ee73528"; + hash = "sha256-9o4cr/KORtanTfuKMAMAOvePB+vK579rR85rY+m8VNM="; + }) + # linux: Replace fop iterate with fop iterate_shared + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6de0a646036283266e1d4aeb583e426005ca5ad4"; + hash = "sha256-cL3ByjUS3QU8fSbuN7ZEEKyjb+6TbbZL10UKbSgNl6c="; + }) + # Linux 6.6: convert to ctime accessor functions + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6413fdbc913834f2884989e5811841f4ccea2b5f"; + hash = "sha256-vdK25vfS5Yr0xQufzUk431FXHwMIWlP2UpLjqnobJWI="; + }) + # Linux 6.6: Pass request_mask to generic_fillattr + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=4f1d8104d17d2b4e95c7abaf5498db6b80aefa8f"; + hash = "sha256-XJpqbDB/LOuqZj3gPHlcLeGzAQCGvPH8ArgWf+sbBJU="; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 7d57eca64195b..fc5d0b4ce7c28 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -164,7 +164,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; - maintainers = with maintainers; [ ninjatrappeur yuka kloenk yayayayaka ]; + maintainers = with maintainers; [ picnoir yuka kloenk yayayayaka ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6ef9287004fdf..93cd01950d6b4 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.6.7557-1cf77d501"; + version = "1.32.7.7621-871adbd44"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0ym2s425084l5lzpw9j1aqw2nc6f4l5vzizvpj1gicf4yp2dyk91"; + sha256 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1jqgglyzlfzq5saa21338vn2v3x25vl24x1w17j5wq30ca7nmzdr"; + sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix deleted file mode 100644 index c335358b6dd17..0000000000000 --- a/pkgs/servers/prayer/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: - -let - ssl = lib.optionals uwimap.withSSL - "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; -in -stdenv.mkDerivation rec { - pname = "prayer"; - version = "1.3.5"; - - src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz"; - sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; - }; - - patches = [ - ./install.patch - - # fix build errors which result from openssl changes - (fetchpatch { - url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch"; - sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch"; - sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1"; - }) - ]; - - postPatch = '' - sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ - ${ssl} \ - -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ - -e 's,^PREFIX .*,PREFIX='$out, \ - -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \ - Config - sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ - templates/src/*.pl - sed -i -e '/<stropts.h>/d' lib/os_linux.h - '' + /* html-tidy updates */ '' - substituteInPlace ./session/html_secure_tidy.c \ - --replace buffio.h tidybuffio.h - ''; - - buildInputs = [ openssl db zlib uwimap html-tidy pam ]; - nativeBuildInputs = [ perl ]; - - NIX_LDFLAGS = "-lpam"; - - meta = { - homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/"; - description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/servers/prayer/install.patch b/pkgs/servers/prayer/install.patch deleted file mode 100644 index 439202dd95558..0000000000000 --- a/pkgs/servers/prayer/install.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/accountd/Makefile b/accountd/Makefile -index c3e8107..7946776 100644 ---- a/accountd/Makefile -+++ b/accountd/Makefile -@@ -75,6 +75,6 @@ clean: - -rm -f prayer-accountd test core *.o *~ \#*\# - - install: -- $(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \ -+ $(INSTALL) -m 755 \ - prayer-accountd ${BROOT}${BIN_DIR} - -diff --git a/files/Makefile b/files/Makefile -index 743d0ed..7eff064 100644 ---- a/files/Makefile -+++ b/files/Makefile -@@ -52,20 +52,20 @@ distclean: - - install-cert: - if [ -f certs/prayer.pem ]; then \ -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \ -+ $(INSTALL) \ - -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \ - fi - - install-config: etc/prayer.cf -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -D -m $(PUBLIC_FILE) \ - etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE} - - install-aconfig: -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -D -m $(PUBLIC_FILE) \ - etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE} - - install-motd: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -m $(PUBLIC_FILE) \ - etc/motd.html ${BROOT}${PREFIX}/etc - - install: -@@ -83,6 +83,6 @@ install: - if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi - - redhat-install-init.d: -- install -D -o root -g root -m 755 \ -+ install -D -m 755 \ - ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer - #chkconfig prayer --level 2345 on -diff --git a/files/install.sh b/files/install.sh -index 8d1d1f4..0804a08 100755 ---- a/files/install.sh -+++ b/files/install.sh -@@ -2,8 +2,6 @@ - # - # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $ - --PATH=/bin:/sbin/:/usr/bin:/usr/sbin -- - error=0 - - if [ "x$PREFIX" = "x" ]; then -@@ -55,24 +53,20 @@ if [ $error != 0 ]; then - exit 1 - fi - --if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then -- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX} --fi -- - if [ ! -d ${PREFIX} ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX} -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX} - fi - - if [ ! -d ${PREFIX}/etc ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc - fi - - if [ ! -d ${PREFIX}/certs ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs -+ ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs - fi - - if [ ! -d ${BIN_DIR} ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR} -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR} - fi - - for i in icons static -@@ -83,5 +77,4 @@ do - fi - echo Copying ${i} - (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -) -- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i}) - done -diff --git a/servers/Makefile b/servers/Makefile -index 021aed5..5ccbd08 100644 ---- a/servers/Makefile -+++ b/servers/Makefile -@@ -107,13 +107,13 @@ clean: - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-chroot $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-session $(BROOT)$(BIN_DIR) - - prayer: $(PRAYER_OBJS) prayer_main.o -diff --git a/templates/cam/Makefile b/templates/cam/Makefile -index 9f4122a..396b628 100644 ---- a/templates/cam/Makefile -+++ b/templates/cam/Makefile -@@ -124,7 +124,7 @@ _template_index.c: - $(COMPILE) $(TYPE) $@ $* - - install: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) -diff --git a/templates/old/Makefile b/templates/old/Makefile -index 31016cf..288a64c 100644 ---- a/templates/old/Makefile -+++ b/templates/old/Makefile -@@ -123,7 +123,7 @@ _template_index.c: - $(COMPILE) $(TYPE) $@ $* - - install: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) -diff --git a/utils/Makefile b/utils/Makefile -index 9c79916..ef82481 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -72,15 +72,15 @@ clean: - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-ssl-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-sem-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-db-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-cyclog $(BROOT)$(BIN_DIR) - - prayer-ssl-prune: $(PRUNE_OBJS) diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 51ab46ec73b98..30ca1318b9cf7 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, mbedtls, meson, ninja, fetchFromGitHub }: +{ lib, stdenv, fetchzip, mbedtls, meson, ninja }: let webManModVersion = "1.47.42"; in @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { mbedtls ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Doff64_t=off_t"; + postInstall = '' install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT ''; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 7ea36b0247914..ce5deb19de5bc 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -52,6 +52,7 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; + mainProgram = "Radarr"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index a2efdb1e1be7e..e41ec383a9bf5 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -46,6 +46,7 @@ in stdenv.mkDerivation rec { homepage = "https://readarr.com"; license = licenses.gpl3; maintainers = [ maintainers.jocelynthode ]; + mainProgram = "Readarr"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index ac5ae80cdc260..716a386c4faa4 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sonarr.tv/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fadenb purcell ]; + mainProgram = "NzbDrone"; platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index acf4b07516201..2c7563fe03c08 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -24,13 +24,13 @@ let }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { - interpreter = pkg.pythonForBuild.interpreter; + interpreter = pkg.pythonOnBuildForHost.interpreter; path = "plugins/python"; inputs = [ pkg ncurses ]; install = '' install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py - ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ - ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonOnBuildForHost.executable} -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonOnBuildForHost.executable} -O -m compileall $out/${pkg.sitePackages}/ ''; }; @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.22"; + version = "2.0.23"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-pfy3EDXq3KVY2mC3BMAp/87IUiP4NhdTWZo+zVBJ+Pc="; + hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg="; }; patches = [ diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index 91ae16072c3f4..a1042c8e59c31 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.2"; + version = "18.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-dlyq+ZrsiodYwZqzFLdR067O6gaePdPIX3N0xvXLcwg="; + sha256 = "sha256-8RZqzuMjy83WNvIBpNxjJpfuILCXIuwP0mrs+/cSTns="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index bff64dd3bb0a3..c1a68f2d5e6a1 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv +{ lib , buildNpmPackage , fetchFromGitHub -, fetchurl -, unzip , dotnetCorePackages , buildDotnetModule , mono @@ -27,14 +25,13 @@ let platforms = platforms.linux; }; - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; - - wwwroot = buildNpmPackage' { + wwwroot = buildNpmPackage { inherit meta version; pname = "slskd-web"; src = "${src}/src/web"; npmFlags = [ "--legacy-peer-deps" ]; + nodejs = nodejs_18; npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; installPhase = '' cp -r build $out diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix index 464d499cf1fb0..b3401ff78fc74 100644 --- a/pkgs/servers/web-apps/whitebophir/default.nix +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -7,7 +7,7 @@ let nodejs = nodejs_20; -in buildNpmPackage.override { nodejs = nodejs_20; } rec { +in buildNpmPackage rec { pname = "whitebophir"; version = "1.19.1"; @@ -18,6 +18,8 @@ in buildNpmPackage.override { nodejs = nodejs_20; } rec { hash = "sha256-4T7s9WrpyHVPcw0QY0C0sczDJYKzA4bAAfEv8q2pOy4="; }; + inherit nodejs; + npmDepsHash = "sha256-mKDkkX7vWrnfEg1D65bqn/MtyUS0DKjTtkDW6ebso7g="; # geckodriver tries to access network diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index dea632e5420c6..49a832a56dd8f 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1208447", - "sha256": "1xavixayja6b2mxjp478yxkiimykmg50r23bl011nmkvir7sgm9f", + "rev": "1238966", + "sha256": "1qrizj0smwlxzv70l2f4dz737qggij2saqx4dc0vfrp4pn0qxw56", "version": "6.3" }, "fr_FR": { "path": "fr_FR", - "rev": "1227211", - "sha256": "1fgzjbzwd3h1i92ylxjmyagswgd2lg1bimnz00zckqk3z1jl2693", + "rev": "1258401", + "sha256": "157w59jl4b3ysjiflzav3kvbmqkglgr3k4cbh6f8iqhz6wkzw5h3", "version": "6.3" }, "ro_RO": { "path": "ro_RO", - "rev": "1219994", - "sha256": "0xjdv91pqpvzqajcaazcqvb79842llzl27lp2cqr4r8p2kivg94d", + "rev": "1255832", + "sha256": "0c6hp40rgxg8ai3f35k2bgh4q66qf1g8qgv3jgbq6dcxr090fia2", "version": "6.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 16e1a8528e792..5628f57f138b2 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.29", - "rev": "2959271", - "sha256": "0ggyy9l33czv72vp1y4n03ky2nr2ysllkz5phfy9axhhv5a01ip0", - "version": "2.0.29" + "path": "breeze/tags/2.0.31", + "rev": "2982492", + "sha256": "0ij7lqxnhkpzd98bxfsdz2ydgm7yj9ig41fxkibr25crv76dwfai", + "version": "2.0.31" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -42,10 +42,10 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.10", - "rev": "2956191", - "sha256": "1mi4ml1s92ljd85f1fiig1p1yi962db07m4kjw7vl3b7l3j4qdq5", - "version": "2.4.10" + "path": "cookie-notice/tags/2.4.11.1", + "rev": "2974733", + "sha256": "0bq6i4s7zkx0x5qb65d93h0sdkd17vka10k8xicfin7qdy5fdcf6", + "version": "2.4.11.1" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", @@ -53,11 +53,17 @@ "sha256": "03vay6j7ac44pg55hlm02lglm3ggmjxdq95dhh0cmavbiafimhqq", "version": "1.0.1" }, + "embed-extended": { + "path": "embed-extended/tags/1.4.0", + "rev": "2982701", + "sha256": "1qfxy9rp6ipp6r6m70vr30clbm2akssra4jbk8fss3qiz85rmfxa", + "version": "1.4.0" + }, "gutenberg": { - "path": "gutenberg/tags/16.7.0", - "rev": "2972264", - "sha256": "0mpbpp0c8dmpv3591i92xhjr44dnhbpgx4vln0q4cjdq5c6638r8", - "version": "16.7.0" + "path": "gutenberg/tags/16.9.0", + "rev": "2984221", + "sha256": "09pyh2w7kbqdq0y1zbsss3xizbk03g9wb85f510shc5znyjapngd", + "version": "16.9.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,10 +78,10 @@ "version": "2.4.5" }, "jetpack": { - "path": "jetpack/tags/12.6.2", - "rev": "2972327", - "sha256": "1659k1418rcmxc51pfwlbbfcq3fskr1n04vlzgx5wi7a3bgjv47n", - "version": "12.6.2" + "path": "jetpack/tags/12.8", + "rev": "2990174", + "sha256": "10s2870kp8gp89rbgbkg21bxk6c238kklm1rgrpkry7m1w8qzsi2", + "version": "12.8" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -120,22 +126,22 @@ "version": "1.3.5" }, "static-mail-sender-configurator": { - "path": "static-mail-sender-configurator/tags/0.9.3", - "rev": "2574393", - "sha256": "0dirfpm71av0a6qhfsczn94ry9gam4zsyin0czzy8bjzbwd6m649", - "version": "0.9.3" + "path": "static-mail-sender-configurator/tags/0.10.0", + "rev": "2941521", + "sha256": "1mrwgqp1ril54xqr8k2gwgjcsbf4xv3671v15xawapwz730h2c4r", + "version": "0.10.0" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.0", - "rev": "2972415", - "sha256": "1ppa3npnvzn3a50hflpfzxgp3c79gn7zxvxiga9qhamhqpvnk48d", - "version": "5.11.0" + "path": "webp-converter-for-media/tags/5.11.2", + "rev": "2985470", + "sha256": "1q8jdpvjrp5y5avgrg4cyq7amvz93ww7nm4mpiqgxmjn9l01dmvv", + "version": "5.11.2" }, "webp-express": { - "path": "webp-express/tags/0.25.6", - "rev": "2899406", - "sha256": "1ah2gbm5aiqa4yw3kfhx49n6j3jyl6s44s9c5xqnpsjxr211h7p4", - "version": "0.25.6" + "path": "webp-express/tags/0.25.8", + "rev": "2981697", + "sha256": "17v94im2cnvjiglfzbqq598blwn7m5j84sd8ysbq8lc60kwn0vi3", + "version": "0.25.8" }, "wordpress-seo": { "path": "wordpress-seo/tags/20.7", @@ -156,10 +162,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.1.9", - "rev": "2962251", - "sha256": "0dwd8csv3ixixiajgihxx1xhwq9vy3idlhw4ya2xsyk38gisfa4z", - "version": "1.1.9" + "path": "wp-fastest-cache/tags/1.2.1", + "rev": "2988099", + "sha256": "07fbib36zwzagshnx85i7lis65vgbva8q9fs2i1zk687yway60fx", + "version": "1.2.1" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -181,9 +187,9 @@ }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2945958", - "sha256": "0s8rp2h43sslb5c2h3d9h72qcwd7krn8hggh412l5r2j87cn4qwf", - "version": "1.0.33" + "rev": "2978937", + "sha256": "0pn3l5v43hc572bym15pcdirq9n64mdgshacnr92hryq4vagyvzb", + "version": "1.0.34" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -192,9 +198,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.4", - "rev": "2972627", - "sha256": "17gydpbhfk4j4r2scs3nn938xynxgqx3c5jdn4avxh4s4ms649al", - "version": "1.8.4" + "path": "wpforms-lite/tags/1.8.4.1", + "rev": "2982999", + "sha256": "08yl41kxxdq36wcrypjrrbmckkpx464sqcarbk7pkzz83933z2pv", + "version": "1.8.4.1" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json index 8cd103dbc2b39..89923e6b538a0 100644 --- a/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -1,21 +1,21 @@ { "twentynineteen": { - "path": "twentynineteen/2.5", - "rev": "188109", - "sha256": "0v9fn05mjy81axxff2f37jvsz698hpp8dy18nlnghdab99f36j9c", - "version": "2.5" + "path": "twentynineteen/2.6", + "rev": "206169", + "sha256": "0wad8gnha0hnvqmcpvckq42xzi8nvrys4jflsbxiq694fzzr8wk5", + "version": "2.6" }, "twentytwenty": { - "path": "twentytwenty/2.2", - "rev": "188108", - "sha256": "1swmg6n0xcdpz21b2h277ajjhv41apnmnnp1w8frii458vxd121r", - "version": "2.2" + "path": "twentytwenty/2.3", + "rev": "206172", + "sha256": "0za1hkaymnphscabwrjxiskv9wgzp7rjwbxazyi19zhb85zh9niq", + "version": "2.3" }, "twentytwentyone": { - "path": "twentytwentyone/1.8", - "rev": "188107", - "sha256": "19kb1wvdjyrh5xqhbn69c2gr3mfdl24cbzpdz2d5idb8fqyha5kr", - "version": "1.8" + "path": "twentytwentyone/1.9", + "rev": "206170", + "sha256": "0z7w6lk8aaj9wzi1g5rx5ji0w8d221k6cr7asyvsjwm0axdgnj50", + "version": "1.9" }, "twentytwentythree": { "path": "twentytwentythree/1.2", @@ -24,9 +24,9 @@ "version": "1.2" }, "twentytwentytwo": { - "path": "twentytwentytwo/1.4", - "rev": "188106", - "sha256": "1y6rmfqchifhs9ckilmn3jnc9hc683a8r2gcsiq0vvvvik9ca09r", - "version": "1.4" + "path": "twentytwentytwo/1.5", + "rev": "206171", + "sha256": "1zk83kn23gksk27xddqn31sdlhmsqz48p2r24qrbqyay367j8jln", + "version": "1.5" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 505874af68d40..da458b8ede9f2 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -8,6 +8,7 @@ , "cookie-notice" , "co-authors-plus" , "disable-xml-rpc" +, "embed-extended" , "gutenberg" , "hello-dolly" , "hkdev-maintenance-mode" diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 671e88c52810f..1cbd33cd4fd9a 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,6 +1,7 @@ { stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd , flock, autoreconfHook +, gawk , nixosTests , withMysql ? false , withPgsql ? false @@ -12,7 +13,7 @@ }: let - ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; + ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ]; in stdenv.mkDerivation rec { pname = "ejabberd"; version = "23.01"; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 10bd86ba0594d..4504d6c86176c 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oh"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "michaelmacinnis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DMxC5fv5ZLDv7gMajC/eyJd2YpO+OXFdvwAPYotnczw="; + sha256 = "sha256-ryIh6MRIOVZPm2USpJC69Z/upIXGUHgcd17eZBA9Edc="; }; - vendorHash = "sha256-f4rqXOu6yXUzNsseSaV9pb8c2KXItYOalB5pfH3Acnc="; + vendorHash = "sha256-Qma5Vk0JO/tTrZanvTCE40LmjeCfBup3U3N7gyhfp44="; meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 63fd00d266e4e..9a794531bc1d7 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -152,9 +152,8 @@ let # flakeNote will be printed in the remediation messages below. flakeNote = " - Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+ - (Flake) command, `--impure` must be passed in order to read this - environment variable. + Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake, + then pass `--impure` in order to allow use of environment variables. "; remediate_allowlist = allow_attr: rebuild_amendment: attrs: diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 05861ee5e0eb6..664349416b713 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,13 +11,15 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; - "11.7" = throw "The tag 11.7 of cuda-samples does not exist"; + # The tag 11.7 of cuda-samples does not exist "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; - }.${prev.cudaVersion}; + "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; + "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng="; + }; -in { +in prev.lib.attrsets.optionalAttrs (builtins.hasAttr prev.cudaVersion sha256) { cuda-samples = final.callPackage ./generic.nix { - inherit sha256; + sha256 = sha256.${prev.cudaVersion}; }; } diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index 267eca10d8e88..e690f32959f2a 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,31 +1,46 @@ -{ lib -, cudaPackages +{ autoAddOpenGLRunpathHook +, backendStdenv +, cmake +, cudatoolkit +, cudaVersion , fetchFromGitHub , fetchpatch -, addOpenGLRunpath -, cudatoolkit +, freeimage +, glfw3 +, lib , pkg-config , sha256 -, glfw3 -, freeimage }: -cudaPackages.backendStdenv.mkDerivation rec { +backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; - version = lib.versions.majorMinor cudatoolkit.version; + version = cudaVersion; src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; inherit sha256; }; - nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ]; + nativeBuildInputs = [ + pkg-config + autoAddOpenGLRunpathHook + glfw3 + freeimage + ] + # CMake has to run as a native, build-time dependency for libNVVM samples. + ++ lib.lists.optionals (lib.strings.versionAtLeast finalAttrs.version "12.2") [ + cmake + ]; + + # CMake is not the primary build tool -- that's still make. + # As such, we disable CMake's build system. + dontUseCmakeConfigure = true; buildInputs = [ cudatoolkit ]; # See https://github.com/NVIDIA/cuda-samples/issues/75. - patches = lib.optionals (version == "11.3") [ + patches = lib.optionals (finalAttrs.version == "11.3") [ (fetchpatch { url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; @@ -41,21 +56,15 @@ cudaPackages.backendStdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/* + install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* runHook postInstall ''; - postFixup = '' - for exe in $out/bin/*; do - addOpenGLRunpath $exe - done - ''; - meta = { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; }; -} +}) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 034f88ec732d3..5ff20fd17b1d6 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.14.0"; + version = "1.14.2"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-4LgTAoPly551vzZ8StF01+zpBGAO7fpcyq3IrSrDhlg="; + hash = "sha256-KtSmDBr2JRxyBUJ5UWMmnfN87oO1/TiCrtuxA2b9Ph0="; }; - vendorHash = "sha256-YZ9/eqKZ0PDHZL6f3J7Obfq34Xk3swU/gGwzWJ2QsKs="; + vendorHash = "sha256-B7t1syBJjwaTM4Tgj/OhhmHJRAhJ/Ewg+g55AKpdj4c="; nativeBuildInputs = [ makeWrapper ]; @@ -28,6 +28,11 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; + checkFlags = [ + # requires network access + "-skip=TestAWSConsoleUrl|TestAWSFederatedUrl" + ]; + meta = with lib; { homepage = "https://github.com/synfinatic/aws-sso-cli"; description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard"; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index c56acff3ccb1c..b59f702701f7b 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , python3 , groff , less , fetchFromGitHub +, installShellFiles , nix-update-script , testers , awscli2 @@ -20,8 +22,8 @@ let urllib3 = prev.urllib3.overridePythonAttrs (prev: { format = "setuptools"; src = prev.src.override { - version = "1.26.16"; - hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + version = "1.26.18"; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; }; }); }); @@ -30,21 +32,21 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.28"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.33"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-rl4gBjuCnXfyJMv/2KIeujK0ouR624+AYaVYn4ri1Nk="; + hash = "sha256-5ANfMa7b72z5E1EH9+dJ9avLDBnSEFGqvDOFFzLbZcM="; }; postPatch = '' 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.19.6' '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' @@ -59,6 +61,7 @@ with py.pkgs; buildPythonApplication rec { ''; nativeBuildInputs = [ + installShellFiles flit-core ]; @@ -87,15 +90,10 @@ with py.pkgs; buildPythonApplication rec { ]; postInstall = '' - mkdir -p $out/${python3.sitePackages}/awscli/data - ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index - - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws - - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - + installShellCompletion --cmd aws \ + --bash <(echo "complete -C $out/bin/aws_completer aws") \ + --zsh $out/bin/aws_zsh_completer.sh + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm $out/bin/aws.cmd ''; @@ -136,7 +134,7 @@ with py.pkgs; buildPythonApplication rec { meta = with lib; { description = "Unified tool to manage your AWS services"; - homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; + homepage = "https://docs.aws.amazon.com/cli/latest/userguide/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 84195ebcbaf04..b6a73381e190b 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.91.1"; + version = "3.92.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-linux-x64.tar.gz"; - sha256 = "1f8ywz395aby9q2gxkjj6f8ff8wr755fgy96sxjcdr78cw8rjm0z"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-linux-x64.tar.gz"; + sha256 = "1242rammgc5wghyasz9ir9x0jff2yrn8c0cjnmdrg3nz7hihl5mb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; @@ -21,16 +21,16 @@ sha256 = "0qi3wp5iy9pym4yqzx1186paz80dv7lppcd0jw4fgpi8lclfygbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-linux-amd64.tar.gz"; - sha256 = "0ykzbcjglc4g4ac46w2h7xmvfa2dqnnswhy9wf787jmi00msz259"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-linux-amd64.tar.gz"; + sha256 = "06ycizhynnmr9g0awqn9y8jglxl7brxrzibxh9lb55kiy5vl8vry"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz"; sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-linux-amd64.tar.gz"; - sha256 = "187ryaf24vv6mwwhv8cw5g3hpi67ssc0n98fsff9rllnb6p4k2k9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-linux-amd64.tar.gz"; + sha256 = "112rd5hhmcp2h7r6jzihcb8g1w1r4g1ba1mwk808nwqfgswfi2wf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-amd64.tar.gz"; @@ -41,12 +41,12 @@ sha256 = "029xymc6ynb7aq5wdkvksgqhjl9aix5j3rn8dfzlbmrmmz0xyvxr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-linux-amd64.tar.gz"; - sha256 = "1yfysnc4y6pi6ys1gv3aik7qx6xs27jyf5cz7s9cyr5wm9a3bhkc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-linux-amd64.tar.gz"; + sha256 = "0hk2niplgjhkq7fhkwhhka33cikdami7r6g2f80c7d94g8wpgf5x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-linux-amd64.tar.gz"; - sha256 = "0px43nn5c8dfairg9jilv67kv7jdclw588d910hzx2wci6ym7vjs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-linux-amd64.tar.gz"; + sha256 = "1vn3rayqdg8hff0bcbmzy2nz9pzbki00y729jxdlkv2k4y4raik6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "0bsbfsc7wxsjyqyz5klxn91hd1lwini4pbpm0lw5pf78af7z8v0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.22.0-linux-amd64.tar.gz"; - sha256 = "059mh2p2f8wdkgqkcf7nvdwibb5kc0c2924w88z5f3kmchr3mfr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-linux-amd64.tar.gz"; + sha256 = "1r1sfxngwkf89lni0l8zalh2vz5a7m9ap4p15cs4bc98zmkin762"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "1l3pqshzxscv3pxp5wjyrc83irkhh6g7hbdi51x2jhdywjz5r55m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-linux-amd64.tar.gz"; - sha256 = "148sg0jsm05qqgi10m8y4b7ib1miyvs1346h36mg1pf8hykg3psb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1047qlwrv42llknx25r2iqdchparcrc5krpbjcqq194rpzq73m02"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "0f5sii66fffq5qrri8r1a3xzskvj9yx6chr7j2s34kgc11dqrbxc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-linux-amd64.tar.gz"; - sha256 = "0a1rspln39zznn6fh3nwqnaczv9xssmdikpbq938h7n2x4kv28pd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-linux-amd64.tar.gz"; + sha256 = "1r079igvw2cv90sq5c7ldfvyfni3a6vh8bwj9hzbjwmcmpdf2lri"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-linux-amd64.tar.gz"; - sha256 = "00vj8z57d9387h2spx9spf73wql27ld4vd88z5702nmbwkhsn1d1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-linux-amd64.tar.gz"; + sha256 = "10llnm73xzm8p2jjiny1zbx9snh633vi8psbaxc2hrjv8ks803i0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "0b6nd5gk0d2vg6z0ql87zjyvl880h390g767d9vggwzlwljxzhsm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-amd64.tar.gz"; - sha256 = "1jwiidxbfg6r0nm4l6p09n5yqaybxdl300s88jxppjn7dwn9dgwq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-amd64.tar.gz"; + sha256 = "0lyx8wjzjhh38lzfdh6d4qns40cj14nrjmrsdiwrfk6h60s0bh1c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-darwin-x64.tar.gz"; - sha256 = "0r0xybia32qqpggddkcc40qzykvib50ff03lygab5lyqb3n8dajz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-darwin-x64.tar.gz"; + sha256 = "199qq9j471dw3114kv9dwkpb0bnf3cw6c3khs1kldv8rrh6f3bnv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; @@ -179,16 +179,16 @@ sha256 = "0rrs93qrqz4bs66ydjb2y4jl6l7pdycs4hqpgp110mipn54bkfix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-darwin-amd64.tar.gz"; - sha256 = "0ki1iyw92baf63qd9r3hingmdqiidqzy8j7arcmd0jsvaqvarqqv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-darwin-amd64.tar.gz"; + sha256 = "03rvwmslb8z5y0whfw8n9ycdi943kniacw5jxasi4crciz5ynldf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz"; sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-darwin-amd64.tar.gz"; - sha256 = "158wzpj4qmazs4hypv7bdm0n1d0xaay94cmz9aa60yww9sj8nhkl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-darwin-amd64.tar.gz"; + sha256 = "08acycw7qz7dz6hb7yrja38gkqb309nbski68g9vpbvgg71b4kkm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-amd64.tar.gz"; @@ -199,12 +199,12 @@ sha256 = "16zc13z31p92775v3vsn6j6pmz1wcjqb8rhzxpnr03zbqviws7mi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-darwin-amd64.tar.gz"; - sha256 = "12i0flgcmz0nb7mq55sg5bl5pbh60n047fw0xkhk3mvzl0z7i47b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-darwin-amd64.tar.gz"; + sha256 = "1jdxf418lrh1rzhmkcjpvx1l5pc7gjigyxdxfzf9ig8fxhwrnwhm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-darwin-amd64.tar.gz"; - sha256 = "08xvqljn0k1lm3yw4apc3h3dj6l086p7qaygv6354lgp63ab0as7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-darwin-amd64.tar.gz"; + sha256 = "0h6lsjh7243792x943900aw714i7nkjcyn8sgcy4y2z2c43ic1pz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1qyb6v3bxg7hsr5viwpc4nzdgq63frjqgxs7kqyg1pp40rcmh2bm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.22.0-darwin-amd64.tar.gz"; - sha256 = "1zqfzpc4647x965l5phqz67cq7hbnmyc20acmgb4xvax4hif8yk7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-darwin-amd64.tar.gz"; + sha256 = "0iymy2rjyxya49w7awrjns4pnj4m2m66iqf59f1a6ww4i5qmx5f1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "0xdfxxlfxm44bkljc5c8h3ici7dlkbgbg6z2ns4870p15lhq34n5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-darwin-amd64.tar.gz"; - sha256 = "0p30xhj6k46cdy84c7zr4hgdpi3rqvdjqjx8kr8a1ky29569ji4j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "159p2fxfhgck431cbzs5ik6s4bprx8jp5nxi28ir52qyfaj3xx6x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-amd64.tar.gz"; @@ -251,12 +251,12 @@ sha256 = "19zm781g8ii062dp48wf11pdyrddk10c5rf18xk4bpf2prbg5vsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-darwin-amd64.tar.gz"; - sha256 = "0bm17zim436179azhpiwkxx10ici0va96lx1i1p6drhc0rvd0sq8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-darwin-amd64.tar.gz"; + sha256 = "1mj438fnidycdbxi168z3bkc8fxpw1fzagssxzwawd2d6faxv919"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-darwin-amd64.tar.gz"; - sha256 = "02nwq7z29z3cskya70r9x3497wqbp4i97n1bh5fr0galp6w8fdi3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-darwin-amd64.tar.gz"; + sha256 = "087i49sx3cw7vylq01vby1mhblr03ib302yhss7sx944brzc53hv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "0aicxgwxs7mp9y88m8am0wl34h6llxj4jzww18alawkvxm1msah8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-amd64.tar.gz"; - sha256 = "0wph3f11dkvn956nmx9r57ynjaal6kj7qb08rwfiv792dlk5d5bc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-amd64.tar.gz"; + sha256 = "0pdwgfbvak564n3ic72jzj6nhy04lra1a4a6z5jmknk59d6jvhjw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-linux-arm64.tar.gz"; - sha256 = "00pl2340naa7jb0gg9fgnzl8y9n299crqfdvhik1ii1alk8jnc88"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-linux-arm64.tar.gz"; + sha256 = "1d1ynrc13a844fd58dkrva59fqjn2x9inhc4a7887arq1j0qww5p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; @@ -337,16 +337,16 @@ sha256 = "1mncqhlr8ga43pkay8cn0nj9b3kzd8jb65wp02gqsgf8adracrks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-linux-arm64.tar.gz"; - sha256 = "0hrhy064j5mmjpvzrbg6vyvi9wjcsmll8zj8x0j7wnwkv69i80ah"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-linux-arm64.tar.gz"; + sha256 = "0x6k6ng49nnh72ca1jcqg1nci8i4qhnw90xwgwi0mxc7dndnx73x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz"; sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-linux-arm64.tar.gz"; - sha256 = "1c66scrg8jy0qpm3kh0sfw0142fb1xf86c3yxhndhnxscnjz44i6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-linux-arm64.tar.gz"; + sha256 = "0l8kqxk85vskg4jw2m9qvqjp9bdlzbllbhzj4q1fifmcwj5ks649"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-arm64.tar.gz"; @@ -357,12 +357,12 @@ sha256 = "11gx8zlkakfbwf7vc4j29cd0bfakjf6flgp0a05d8ka5kjq3qkcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-linux-arm64.tar.gz"; - sha256 = "0pll6r5pz8ajh8m1f9lwy938jawhng4lz6byrxgy9ydkklz11ygd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-linux-arm64.tar.gz"; + sha256 = "0gvvzv2qrdma9qah36giwgxgs7vhq86xjmxrsbja2n6jxzdrfszk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-linux-arm64.tar.gz"; - sha256 = "0wvqwc7b90108j160c1xd6xr127jbjhjhfax7a2sff2x6f5xsfck"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-linux-arm64.tar.gz"; + sha256 = "0v5665apxp9bg8vj73p8bni7dqqa2cqawx4dda9rfv35a63rd89w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "1h7yh118iqr0bdkkagf3m0yxnphz5na7vyqqmzs7d9y9kcgfg8gi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.22.0-linux-arm64.tar.gz"; - sha256 = "0d2z8ig79qr4qc7xv0ak00h7n2k613dqpifbdbkp6dhxiw4zmxcq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-linux-arm64.tar.gz"; + sha256 = "11q7cnncwdmjp8klk74wrnm6674ap5lrdjfq7413ps8rbdjpyvhl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "11dfjx05inx1fdknzli0q7gma4hc1217jmfn4bx9ky635nqh5ckq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-linux-arm64.tar.gz"; - sha256 = "14xpg193qf332sa9x4iw39i71k158f5393bqcqrjfccpkk1adwli"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0w2zwbz9slbwnk2zaw88y5npiqh2b5klw1j33c5wv1lr75fy2192"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-arm64.tar.gz"; @@ -409,12 +409,12 @@ sha256 = "1z67c7jwfs2z2hi0fqsxzsb426iv82n9sv3ik6smhq2agcxlaas2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-linux-arm64.tar.gz"; - sha256 = "12987cir0ry23smdb1p8qkm0w9m70mn3pkrlfwwhd8wnswnfsybz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-linux-arm64.tar.gz"; + sha256 = "0b81vgi6n1j3gh8kbf3g3fxlix7iyrn08kkrizmpc7bv5wd0i9ry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-linux-arm64.tar.gz"; - sha256 = "1zi99z4s5kcm3fi5jxa4bpnxznd22vvgary63ydyn7k662dvpvfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-linux-arm64.tar.gz"; + sha256 = "1wvl8h7wfkr1d7rff8j0n30xdc9yx1q3ps7zm8b485isx8hhq4f4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "1zizrk7chxjda8lpkgrvs40f3il2z7xl79fcslq129adhqj2af3k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-arm64.tar.gz"; - sha256 = "0cq2mmzsjk4il1brqp1i8jjl9771krjiir5fk0bhhrzj08jvi0l3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-arm64.tar.gz"; + sha256 = "1g5k564z33dr09yqzk5a2g2wblszrbh8hc6gp1a8g0vynq7a9f6r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-darwin-arm64.tar.gz"; - sha256 = "1vkxw96hnbkccl91qgis05rrjz4qfxgdrbk8zfffd38bn3407wcg"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-darwin-arm64.tar.gz"; + sha256 = "0294zhmxsr3fzd5qz2hlhmcdiyqmncgc8grmhjrlrld1x13rgcxb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; @@ -495,16 +495,16 @@ sha256 = "1prm3b7w0i751rpvwglfkm2wkq24318k2ra8z6rkjsdkcvxa1i5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-darwin-arm64.tar.gz"; - sha256 = "1lpb8l2q4rglynswh0rv5r5qkygw19jh8q951kmg72qwk6prwaly"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-darwin-arm64.tar.gz"; + sha256 = "10blif15dymdbdr40lazaiq8sncfp0gd9phahzcr2m9fh6rx4lpd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz"; sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-darwin-arm64.tar.gz"; - sha256 = "1n9j6kxb0kfskcah6ayjfdr2ra5sa5cbfnh7h0zyj0gzbr6x54v2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-darwin-arm64.tar.gz"; + sha256 = "05ifn20vn66k6sy69l3z1nmnjajfjazlq12cm1vz4apxa8yqxqn4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-arm64.tar.gz"; @@ -515,12 +515,12 @@ sha256 = "0asaq5gg22jgq5x2bn89m9qn3jm7cmdhkypdl5barkmccvsbpfg0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-darwin-arm64.tar.gz"; - sha256 = "0vbhskqjrhvg0xgqxhmd0sy4vi6ilf5d2lc107rs9p85gm2sg82n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-darwin-arm64.tar.gz"; + sha256 = "1vnh7d4n7sd5bfms9vxgr87k9r1ahchmmfng0wml60jvssjbgiyf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-darwin-arm64.tar.gz"; - sha256 = "0069p3sy06r0hhd6jpyn2r36x3za9f6w9i89gpiyc2qzh1hnwcbg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-darwin-arm64.tar.gz"; + sha256 = "1q5474wibhb0y600mcbw1wa59dadcjj2l6p7ihrv6yvdals39408"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "066w46l9dv02pnq59h632w1f7sjj8qqh6867cb33bbh6if681fpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.22.0-darwin-arm64.tar.gz"; - sha256 = "0nvdhfw4bfizq6hmwng7glf248qvz5gzfbfm7ha50zaajbhrilkv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-darwin-arm64.tar.gz"; + sha256 = "1glpfbinny7cm7bk3q5y7g7lyrzmhdlsfjyiaxqwpkwx2960p5iv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "16m568zmhfh9y0ynjs789yiawn22r23i1zz9xsrq1kfx8raq94an"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-darwin-arm64.tar.gz"; - sha256 = "0x6ispcwkx15x753zy6awwlykh66qfk5phwdzsy8gw3j1g033a85"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "1g2qds6iciclawr343ps693ndnwjnss8pxfb5mxc69gf7qz8j03i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-arm64.tar.gz"; @@ -567,12 +567,12 @@ sha256 = "0i0lhxzvxvgi695x9g1nnqrzlipsydjsc3xz8zd7n9438pav3cmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-darwin-arm64.tar.gz"; - sha256 = "0fq8wsrc3pmjpp69ji3bswli532jkkgabr4m2ksgfbqr03qzycnr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-darwin-arm64.tar.gz"; + sha256 = "10phh7s0d83z4n9plh77wqjjr8h5h3zmsjdxk7fj7d72p2awf111"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-darwin-arm64.tar.gz"; - sha256 = "0fy2z52055p6cv0jac3rflz9y0sn69b27rp15xab3bd7zq1rs2ql"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-darwin-arm64.tar.gz"; + sha256 = "08aigahkv3calhcdyws3pm1nac5mdxk81jbys8qxr3c9x3b8wgqz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "0sfbb1m874p04n2qg5w9502r1s2gxdd3lbn9k6xqzdcqi0991vrw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-arm64.tar.gz"; - sha256 = "1mk1034lp6x9gnal12gbmkfpvjv67a7lqfm38nd4slcnvc5p9x8w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-arm64.tar.gz"; + sha256 = "0wcahzjwlbzbv94yv10wmvsppjcvax0d57qk4xpfrdig6lj50mms"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 74d9bb28a5013..76a5eff2973ef 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "2.11.0"; + version = "2.13.0"; rev = "v${version}"; - hash = "sha256-qz/dCQR4BV+noJj7WPGuzDNMaR7I/D01F7FfvxU8z28="; - vendorHash = "sha256-SICms1JJk8Q10XWC69bw/RXsIPL43l1s+Aqy+cLOwRI="; + hash = "sha256-YyJxACeXyY7hZkTbLXT/ASNWa1uv9h3cvPoItR183fU="; + vendorHash = "sha256-20wHbNE/fenxP9wgTSzAnx6b1UYlw4i1fi6SesTs0sc="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index ef458089e31a2..9350a6fd1eed9 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; + mainProgram = "unrar"; maintainers = with maintainers; [ ehmry wegank ]; platforms = platforms.all; }; diff --git a/pkgs/tools/audio/goxlr-utility/default.nix b/pkgs/tools/audio/goxlr-utility/default.nix index 58814cb4423ea..6a2de8379e181 100644 --- a/pkgs/tools/audio/goxlr-utility/default.nix +++ b/pkgs/tools/audio/goxlr-utility/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "goxlr-utility"; - version = "0.12.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "GoXLR-on-Linux"; repo = "goxlr-utility"; rev = "v${version}"; - hash = "sha256-vvaKCsqncRhag8IrS0AIfNqNHGU2WIvFaYISEVfUB2Y="; + hash = "sha256-QKL2iKfn05P20MwT+RAeVzUUyv6FWtxMWuBI+4MgXlQ="; }; - cargoHash = "sha256-Z57H5YeVYqlOaLRLaizVw8xTLstdjyXutnN7OgaUYOE="; + cargoHash = "sha256-LVObMspxhZkK81BjolTZZwoeMunzVwdEWWJAt/aOjZA="; buildInputs = [ libpulseaudio diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 78adea9d222c9..f6b1f6d9f669c 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -103,7 +103,7 @@ python.pkgs.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/utils/monotonic_align - ${python.pythonForBuild.interpreter} setup.py install --prefix=$out + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out ) ''; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 8738f5dc4e247..e2e68109b8018 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; preBuild = '' - ${python3Packages.python.pythonForBuild.interpreter} ./setup.py build_cython build_ext --inplace + ${python3Packages.python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index f7aae8165ef52..ab46893b0d212 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "sigtop"; - version = "0.3.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; rev = "v${version}"; - sha256 = "sha256-U+S+VXRkedq2LkO9Fw/AfNS97GvFEfjD8dq/VMlBOv4="; + sha256 = "sha256-goGvgn1QyWqipcrBvO27BjzFbp7cIPFWzWJaOpp2/1Q="; }; - vendorHash = "sha256-xrJ/KLM/f/HVPL4MJzRc1xDlO4e+Iu2lcPG4GnjFRBo="; + vendorHash = "sha256-K33VZeyOFoLLo64FuYt9bxJvaESSlHEy/2O8kLxxL5U="; makeFlags = [ "PREFIX=\${out}" @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Utility to export messages, attachments and other data from Signal Desktop"; license = licenses.isc; - platforms = platforms.darwin; + platforms = platforms.all; maintainers = with maintainers; [ fricklerhandwerk ]; }; } diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 2381402534e11..de2399adb520a 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,23 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.3.1"; + version = "0.14.0.2"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1lfgqqiyl6isy25wrxzyi3s334ii057g88714igyjjmxh47kygks"; + hash = "sha256-JqDFXf01ZUmeH4LY/ldGTb7xnKiGzm0BqBUii478iw8="; }; patches = [ # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - - # Fixes issue with null dereference in ReadHiddenTags - # Upstream: https://sourceforge.net/p/refind/code/merge-requests/45/ - (fetchpatch { - url = "https://github.com/samueldr/rEFInd/commit/29cd79dedabf84d5ddfe686f5692278cae6cc4d6.patch"; - sha256 = "sha256-/jAmOwvMmFWazyukN+ru1tQDiIBtgGk/e/pczsl1Xc8="; - }) ]; buildInputs = [ gnu-efi ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 602e1ff770714..d9beb8f12fcbd 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.3"; + version = "6.6.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-/OfLP5IOYV5j+vJlpM2fK/OdStyqZiEcmHaX2oWi7t0="; + hash = "sha256-PpLLbYO93mEjGP2ARt1u/0fHhuWdVt1Ozph5RdUTfJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index b13f216b8dbf7..fd2be83691a11 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; + mainProgram = "duperemove"; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 431be3b79d77b..f7e830f3211d3 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "11.0"; + version = "11.1"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI="; + sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ="; }; inherit buildInputs propagatedBuildInputs; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index e2e6e28e3b621..6ee1d96eaf498 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; + sha256 = "sha256-eENtsN9OqPpUQM+O8tPTBzDk26/F/zc2hZ4ZiXiDp2I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 9ce1461ffaeed..d945a4a400942 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = true; + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 8f008c3a3464b..4dc9ca9de6e6f 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ # Prevent the unionfs daemon from being killed during # shutdown. See - # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ # for details. ./prevent-kill-on-shutdown.patch ]; diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 4403ab255dd38..dd7ebc6f3b434 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M="; + sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 1a2e9cb3b1c65..218014db019eb 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; platforms = platforms.unix; + mainProgram = "vips"; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 264587f3e7bc4..c0bfdc61b3d9c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-5f75UTGCWsuMdZKhssSpUiVaRR05YY0bumVUNq2wJtY="; + sha256 = "sha256-DtMskuPpiL1GshoUH1dDazvwHDhmr9gb93V3TRIMxxg="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 84d9c398cdda2..9a1a2c8eca247 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3cJLF80oAqGSJvPPyKcHxaWysA9RtWYGgptailYd4dk="; + sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index 3ec475c764781..db11d391d7a14 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "fuyufjh"; repo = pname; rev = "v${version}"; - hash = "sha256-gTyjj7NND5IYtnXhc454cWSzhAE+DwfPRGEWrHH+GNM="; + hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM="; }; cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE="; diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 945abf1f23b94..6ec48a78fcf96 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-E/QslRDeifFHlHUELv9rYHjfCAB1yXXiXlWOyPNkfps="; + hash = "sha256-KY8GUUPZyb89b9mGd+EuYP8M7bKxt7oKQfaaX1R4BTE="; }; - cargoHash = "sha256-7TTHBeZ68G6k5eHBL1zDGsYiTyx27fBbN7Rl9AiZTng="; + cargoHash = "sha256-YTLiJ8/aTN3d2xkEqtiyP47KeDK88I2Raix8kmddDNE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/ccal/default.nix b/pkgs/tools/misc/ccal/default.nix index 55ccb7f774c9c..e7a01795f0db1 100644 --- a/pkgs/tools/misc/ccal/default.nix +++ b/pkgs/tools/misc/ccal/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "ccal"; version = "2.5.3"; src = fetchurl { - url = "http://ccal.chinesebay.com/ccal/${pname}-${version}.tar.gz"; + url = "https://ccal.chinesebay.com/${pname}-${version}.tar.gz"; sha256 = "sha256-PUy9yfkFzgKrSEBB+79/C3oxmuajUMbBbWNuGlpQ35Y="; }; @@ -25,11 +25,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://ccal.chinesebay.com/ccal.htm"; + homepage = "https://ccal.chinesebay.com/ccal.htm"; description = "Command line Chinese calendar viewer, similar to cal"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ sharzy ]; platforms = lib.platforms.all; }; } - diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 498ad0f095196..630b06bcfb3ce 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , intltool , libxml2 @@ -34,6 +35,14 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + patches = [ + # Upstream commit, fixed the version number in v1.0.0 + (fetchpatch { + url = "https://github.com/ddccontrol/ddccontrol/commit/fc8c5b5d0f2b64b08b95f4a7d8f47f2fd8ceec34.patch"; + hash = "sha256-SB1BaolTNCUYgj38nMg1uLUqOHvnwCr8T3cnfu/7rjI="; + }) + ]; + configureFlags = [ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 218eed5eb8bba..b58a7d819bad0 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; + homepage = "https://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f737b78bb6d70..8926b9714291e 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "250"; + version = "251"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-M73txRNzYARVdtUXHy4k92akgxfA6Now83KdqS/rHCI="; + hash = "sha256-7oAFxzLLEds9SI14F88QRhirb/3pjXhmGaW0SWUgpv4="; }; outputs = [ diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index 9e8619459852b..0c04f70f26f30 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "dynamic-colors"; }; } diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 938beff335323..4446400c2f75f 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sorah/envchain"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index ced223496bf48..adab3390de1d2 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-7g2p33j97hu26xwBLrakc7/bIpYHNTC5jqCj/Fs4fKo="; + hash = "sha256-JaD0R1vfHoWMhipMtTW0dlggR7RbD2evHfHrjoZJBmk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 96ce250499d50..4b92e885b6961 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fsql"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "sha256-6KqlpFBaAWrlEjkFQhOEic569+eoYVAsnhMrg8AEPV4="; + sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs="; }; - vendorHash = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; + vendorHash = "sha256-+laTnx6Xkrv3QQel5opqYQSuFmo54UMI2A653xbBWzQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix index 0c79edc042975..dc000a11295aa 100644 --- a/pkgs/tools/misc/fw/default.nix +++ b/pkgs/tools/misc/fw/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index dcef5f026270a..d5ab9a94b84bf 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.21.2"; + version = "1.22.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-dH5Fh3F+UJRS/zZkxhZ7TzLWo0ncUNKbLZdjbnBPloE="; + hash = "sha256-Okuiicq1CAVrE3YPe/aF/HZbf23p6ulz//BRGX77cnw="; }; - vendorHash = "sha256-Ua1Eey0trzha1WyPtwZYvfzOSywb7ThfWcI/VlMgD88="; + vendorHash = "sha256-+ac4q820gETsNRVpW2u0MXU6HfoztLdsWK2HYqJ4mqo="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index dd0af48ec64f3..c3c532ca85f7a 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40="; + sha256 = "sha256-aJBgvgDG3PIogTP7jZtncKeXc7NAnJdtjpBOk303wzs="; }; - cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o="; + cargoHash = "sha256-JJlTS22XveuLd53ck7zduQVvEk1E/yOGkBSTvDf/XEQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 19e926c5caf68..e8f4282fb1937 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -48,5 +48,6 @@ buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; + mainProgram = "grc"; }; } diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 379612ea38629..6ac7233d9d1f6 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-Y5OdRi9OhVeT04BnHCCcNBr1G9vxSFwvNl1aL38AFWQ="; + sha256 = "sha256-nYKqPaO7sA9aWPqngLoTq2PkpAi9zCADFZhYwIK1L2s="; }; - cargoHash = "sha256-fdrcV4XmxaWiAVOL51sRUfTEDnnCKduYgj7I5unLpRI="; + cargoHash = "sha256-Ybz2hNRMWSRuF6tWKsm0Ka7TOKwKvssA9/i6Hqk1tEE="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 8b9b4bd81df26..da800e0a836b5 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.40.2"; + version = "1.40.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-arSC8Vcpwhu7UXwwfp75WorWmmYER18qq4LCE0pE6Gw="; + sha256 = "sha256-PETvcHlR11hdi/KirPXKkH4mrLUyVpyQDtxf3SMx9tw="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 55f4682fb9942..79796255a8431 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.7.1"; + version = "7.8.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-v5HBz3N8H1LBtCRjw+033TRokgVPX5MQ+f7fPvCGBpA="; + sha256 = "sha256-8TOEPPtwxbTlm5nGMjOmH8lvsDu0vNgvxaUOgKS1l/g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 08adb3c199de2..661029cb61c45 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "An autojump \"zap to directory\" helper"; homepage = "https://github.com/euank/pazi"; license = licenses.gpl3; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index cdf77b0af427e..e6ec23266d2c1 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { homepage = "http://pipelight.net/"; license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 8ba527f0ffc2a..eb6cfb7ebcbe1 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.11"; + version = "1.2023.12"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-WYulV/UuFE6xGAJvontHsLKSm7TAtgLrZe4m9WuCSpc="; + sha256 = "sha256-mR17BU5rc0ONnPfhOTppUI1T7v5W//6FHUYXFt5QrdU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Draw UML diagrams using a simple and human readable text description"; - homepage = "http://plantuml.sourceforge.net/"; + homepage = "https://plantuml.com/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index a33199efa7da2..8e5d8325d0596 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ lib.maintainers.devhell ]; + mainProgram = "profile-cleaner"; }; } diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 47e97fa25520e..0f93551965e23 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -6,7 +6,7 @@ , libsecret , python3 , pkg-config -, nodejs +, nodePackages , electron , makeWrapper , makeDesktopItem @@ -63,6 +63,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config + nodePackages.node-gyp ]; buildInputs = [ libsecret @@ -75,17 +76,6 @@ stdenvNoCC.mkDerivation rec { }; }; - preBuild = '' - # Set up headers for node-gyp, which is needed to build keytar. - mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" - - # Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>. - echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" - - # Link node headers so that node-gyp does not try to download them. - ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" - ''; - packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index b8fc4fce50c9e..412d29c3307c6 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -10,16 +10,16 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.0.3"; + version = "2.1.1"; format = "pyproject"; - disabled = python3Packages.pythonOlder "3.7"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rlKJKthop9BQnqjTUq1hZM/NP69gPdEFTq1rU+CbpWA="; + hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 523532904e356..f1e9a0246c5cc 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras danth davidtwco Br1ght0ne Frostman marsam ]; + maintainers = with maintainers; [ danth davidtwco Br1ght0ne Frostman marsam ]; mainProgram = "starship"; }; } diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 3b463f22df078..4478cb4bcb611 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Intuitive, config-driven terminal multiplexer designed for software & systems engineers"; homepage = "https://github.com/austinjones/tab-rs"; license = licenses.mit; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; mainProgram = "tab"; }; } diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index c3e659723df50..c3cb420f5fea8 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -20,9 +20,9 @@ checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom 0.2.10", "once_cell", @@ -73,30 +73,37 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.2" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "amq-protocol" -version = "7.0.1" +version = "7.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc7cad07d1b4533fcb46f0819a6126fa201fd0385469aba75e405424f3fe009" +checksum = "1d40d8b2465c7959dd40cee32ba6ac334b5de57e9fca0cc756759894a4152a5d" dependencies = [ "amq-protocol-tcp", "amq-protocol-types", @@ -108,20 +115,20 @@ dependencies = [ [[package]] name = "amq-protocol-tcp" -version = "7.0.1" +version = "7.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8b20aba8c35a0b885e1e978eff456ced925730a4e012e63e4ff89a1deb602b" +checksum = "9cb2100adae7da61953a2c3a01935d86caae13329fadce3333f524d6d6ce12e2" dependencies = [ "amq-protocol-uri", "tcp-stream", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] name = "amq-protocol-types" -version = "7.0.1" +version = "7.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e245e0e9083b6a6db5f8c10013074cb382266eb9e2a37204d19c651b8d3b8114" +checksum = "156ff13c8a3ced600b4e54ed826a2ae6242b6069d00dd98466827cef07d3daff" dependencies = [ "cookie-factory", "nom", @@ -131,9 +138,9 @@ dependencies = [ [[package]] name = "amq-protocol-uri" -version = "7.0.1" +version = "7.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56987108bf48d2eb500cae8896cd9291564eedd8744776ecc5c3338a8b2ca5f8" +checksum = "751bbd7d440576066233e740576f1b31fdc6ab86cfabfbd48c548de77eca73e4" dependencies = [ "amq-protocol-types", "percent-encoding", @@ -172,11 +179,11 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "anstyle 1.0.0", + "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", @@ -186,21 +193,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c697cc33851b02ab0c26b2e8a211684fbe627ff1cc506131f35026dd7686dd" - -[[package]] -name = "anstyle" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -216,11 +217,11 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ - "anstyle 1.0.0", + "anstyle", "windows-sys 0.48.0", ] @@ -238,11 +239,10 @@ checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" [[package]] name = "apache-avro" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0fdddc3fdac97394ffcc5c89c634faa9c1c166ced54189af34e407c97b6ee7" +checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" dependencies = [ - "byteorder", "digest", "lazy_static", "libflate", @@ -250,15 +250,14 @@ dependencies = [ "num-bigint", "quad-rand", "rand 0.8.5", - "regex", + "regex-lite", "serde", "serde_json", "strum", "strum_macros", "thiserror", - "typed-builder 0.14.0", + "typed-builder 0.16.2", "uuid", - "zerocopy", ] [[package]] @@ -272,9 +271,9 @@ dependencies = [ [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" dependencies = [ "derive_arbitrary", ] @@ -309,9 +308,9 @@ 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 = "ascii" @@ -355,8 +354,8 @@ version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ - "anstyle 1.0.0", - "bstr 1.6.2", + "anstyle", + "bstr 1.7.0", "doc-comment", "predicates", "predicates-core", @@ -366,20 +365,20 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "concurrent-queue 1.2.4", - "event-listener", + "concurrent-queue", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compat" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d" +checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" dependencies = [ "futures-core", "futures-io", @@ -390,29 +389,29 @@ dependencies = [ [[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 = [ "flate2", "futures-core", "memchr", "pin-project-lite", "tokio", - "zstd 0.12.4", - "zstd-safe 6.0.3+zstd.1.5.2", + "zstd 0.13.0", + "zstd-safe 7.0.0", ] [[package]] name = "async-executor" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", - "concurrent-queue 2.0.0", - "fastrand", + "concurrent-queue", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -423,7 +422,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", "futures-lite", @@ -437,8 +436,8 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "blocking", "futures-lite", "once_cell", @@ -457,43 +456,13 @@ dependencies = [ [[package]] name = "async-graphql" -version = "5.0.10" +version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35ef8f9be23ee30fe1eb1cf175c689bc33517c6c6d0fd0669dade611e5ced7f" +checksum = "117113a7ff4a98f2a864fa7a5274033b0907fce65dc8464993c75033f8074f90" dependencies = [ - "async-graphql-derive 5.0.10", - "async-graphql-parser 5.0.10", - "async-graphql-value 5.0.10", - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes 1.5.0", - "fnv", - "futures-util", - "http", - "indexmap 1.9.3", - "mime", - "multer", - "num-traits", - "once_cell", - "pin-project-lite", - "regex", - "serde", - "serde_json", - "serde_urlencoded", - "static_assertions", - "thiserror", -] - -[[package]] -name = "async-graphql" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1f56ef571e325930c41685502269651505160ae0d7e0d7413dd84afe86432c" -dependencies = [ - "async-graphql-derive 6.0.0", - "async-graphql-parser 6.0.0", - "async-graphql-value 6.0.0", + "async-graphql-derive", + "async-graphql-parser", + "async-graphql-value", "async-stream", "async-trait", "base64 0.13.1", @@ -502,7 +471,7 @@ dependencies = [ "fnv", "futures-util", "http", - "indexmap 2.0.0", + "indexmap 2.1.0", "mime", "multer", "num-traits", @@ -518,56 +487,28 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "5.0.10" +version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0f6ceed3640b4825424da70a5107e79d48d9b2bc6318dfc666b2fc4777f8c4" +checksum = "6e4bb7b7b2344d24af860776b7fe4e4ee4a67cd965f076048d023f555703b854" dependencies = [ "Inflector", - "async-graphql-parser 5.0.10", - "darling 0.14.2", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", - "thiserror", -] - -[[package]] -name = "async-graphql-derive" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a3a4c50aafce65a48d1aba749aaa946173a52d274abb5b9f76360a966ce17c6" -dependencies = [ - "Inflector", - "async-graphql-parser 6.0.0", + "async-graphql-parser", "darling 0.20.3", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.67", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.69", "quote 1.0.33", "strum", - "syn 2.0.37", + "syn 2.0.39", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "5.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc308cd3bc611ee86c9cf19182d2b5ee583da40761970e41207f088be3db18f" -dependencies = [ - "async-graphql-value 5.0.10", - "pest", - "serde", - "serde_json", -] - -[[package]] -name = "async-graphql-parser" -version = "6.0.0" +version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64488a0f0afd284f829977437a2e49e9f62cb72ea5fbd96aec19f87351576df" +checksum = "c47e1c1ff6cb7cae62c9cd768d76475cc68f156d8234b024fd2499ad0e91da21" dependencies = [ - "async-graphql-value 6.0.0", + "async-graphql-value", "pest", "serde", "serde_json", @@ -575,35 +516,23 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "5.0.10" +version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d461325bfb04058070712296601dfe5e5bd6cdff84780a0a8c569ffb15c87eb3" +checksum = "2270df3a642efce860ed06fbcf61fc6db10f83c2ecb5613127fb453c82e012a4" dependencies = [ "bytes 1.5.0", - "indexmap 1.9.3", - "serde", - "serde_json", -] - -[[package]] -name = "async-graphql-value" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86046bbced96c0fab3ff5d2b3c769c0c55b0b3a7d67f9e2f2044f349f2e7d501" -dependencies = [ - "bytes 1.5.0", - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_json", ] [[package]] name = "async-graphql-warp" -version = "6.0.0" +version = "6.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de785650dd90a223b5f5968c5345215160a36d196c9295c6c9a316cb29cba04" +checksum = "5d54ac2c41da8f2bc2b5976227d585e787b55f696660d26fd6e1bee50e740f98" dependencies = [ - "async-graphql 6.0.0", + "async-graphql", "futures-util", "serde_json", "warp", @@ -611,43 +540,73 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", - "concurrent-queue 2.0.0", + "cfg-if", + "concurrent-queue", "futures-lite", - "libc", "log", "parking", - "polling", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", - "windows-sys 0.42.0", ] [[package]] -name = "async-lock" -version = "2.6.0" +name = "async-io" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" dependencies = [ - "event-listener", + "async-lock 2.8.0", + "cfg-if", + "concurrent-queue", + "futures-io", "futures-lite", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing 0.1.40", + "waker-fn", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +dependencies = [ + "event-listener 3.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-nats" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2ea11ebe42f65b91c125042bdf8cfb0cccbd344c75e64b98fa3177040e0de9" +checksum = "0e45b67ea596bb94741ef15ba1d90b72c92bdc07553d8033734cb620a2b39f1c" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", - "futures 0.3.28", + "futures 0.3.29", "http", "memchr", "nkeys", @@ -656,7 +615,7 @@ dependencies = [ "rand 0.8.5", "regex", "ring 0.16.20", - "rustls 0.21.7", + "rustls 0.21.8", "rustls-native-certs", "rustls-pemfile", "rustls-webpki", @@ -669,38 +628,36 @@ dependencies = [ "tokio", "tokio-retry", "tokio-rustls 0.24.1", - "tracing 0.1.37", + "tracing 0.1.40", "url", ] [[package]] name = "async-net" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ - "async-io", - "autocfg", + "async-io 1.13.0", "blocking", "futures-lite", ] [[package]] name = "async-process" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", + "event-listener 3.0.1", "futures-lite", - "libc", - "signal-hook", - "windows-sys 0.42.0", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] @@ -709,7 +666,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6012d170ad00de56c9ee354aef2e358359deb1ec504254e0e5a3774771de0e" dependencies = [ - "async-io", + "async-io 1.13.0", "async-trait", "futures-core", "reactor-trait", @@ -721,9 +678,27 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.1.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] @@ -743,33 +718,33 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[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 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -812,7 +787,7 @@ dependencies = [ "time", "tokio", "tower", - "tracing 0.1.37", + "tracing 0.1.40", "zeroize", ] @@ -824,7 +799,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-types", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", "zeroize", ] @@ -838,7 +813,7 @@ dependencies = [ "aws-types", "http", "regex", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -856,7 +831,7 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project-lite", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -997,7 +972,7 @@ dependencies = [ "aws-types", "bytes 1.5.0", "bytes-utils", - "fastrand", + "fastrand 1.9.0", "http", "http-body", "once_cell", @@ -1005,7 +980,7 @@ dependencies = [ "regex", "tokio-stream", "tower", - "tracing 0.1.37", + "tracing 0.1.40", "url", ] @@ -1104,7 +1079,7 @@ dependencies = [ "http", "regex", "tower", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1118,7 +1093,7 @@ dependencies = [ "aws-smithy-http", "aws-types", "http", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1138,7 +1113,7 @@ dependencies = [ "regex", "sha2", "time", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1169,7 +1144,7 @@ dependencies = [ "pin-project-lite", "sha1", "sha2", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1183,18 +1158,18 @@ dependencies = [ "aws-smithy-protocol-test", "aws-smithy-types", "bytes 1.5.0", - "fastrand", + "fastrand 1.9.0", "http", "http-body", "hyper", - "hyper-rustls 0.23.1", + "hyper-rustls 0.23.2", "hyper-tls", "lazy_static", "pin-project-lite", "serde", "tokio", "tower", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1224,7 +1199,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "pin-utils", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1239,7 +1214,7 @@ dependencies = [ "http-body", "pin-project-lite", "tower", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1305,7 +1280,7 @@ dependencies = [ "aws-smithy-types", "http", "rustc_version 0.4.0", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -1356,21 +1331,21 @@ dependencies = [ [[package]] name = "azure_core" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f20eb684aea745292c540173304383c9cba9697d1c31d307620a57d6f878fa9" +checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "dyn-clone", - "futures 0.3.28", + "futures 0.3.29", "getrandom 0.2.10", "http-types", "log", "paste", "pin-project", - "quick-xml 0.30.0", + "quick-xml 0.31.0", "rand 0.8.5", "reqwest", "rustc_version 0.4.0", @@ -1383,39 +1358,38 @@ dependencies = [ [[package]] name = "azure_identity" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15ab021e72fa7196fa8406951f7e85a3476e4968568b2ce3866d2ceed831655" +checksum = "8bd7ea32ca7eb66ff4757f83baac702ff11d469e5de365b6bc6f79f9c25d3436" dependencies = [ - "async-lock", + "async-lock 3.0.0", "async-trait", "azure_core", - "fix-hidden-lifetime-bug", - "futures 0.3.28", + "futures 0.3.29", "log", "oauth2", "pin-project", "serde", "serde_json", "time", + "tz-rs", "url", "uuid", ] [[package]] name = "azure_storage" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf64f9d78e573f64e189fa7188c4e6a0f605e27740105a8d32038b3ba8c913be" +checksum = "83ca0a07f89fd72a006da4713e93af3d6c44a693e61a1c3c2e7985de39c182e8" dependencies = [ "RustyXML", "async-trait", "azure_core", "bytes 1.5.0", - "futures 0.3.28", + "futures 0.3.29", "hmac", "log", - "once_cell", "serde", "serde_derive", "serde_json", @@ -1427,15 +1401,15 @@ dependencies = [ [[package]] name = "azure_storage_blobs" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61299a8b65b88acba1a079a0b5e8a39970a12cb53e35ada2641687edb022d5a" +checksum = "8096c04d370118323c42b2752aa1883e4880a56ef65239f317b359f263b6e194" dependencies = [ "RustyXML", "azure_core", "azure_storage", "bytes 1.5.0", - "futures 0.3.28", + "futures 0.3.29", "log", "serde", "serde_derive", @@ -1458,27 +1432,27 @@ dependencies = [ [[package]] name = "backon" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34fac4d7cdaefa2deded0eda2d5d59dbfd43370ff3f856209e72340ae84c294" +checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9" dependencies = [ - "futures 0.3.28", + "fastrand 1.9.0", + "futures-core", "pin-project", - "rand 0.8.5", "tokio", ] [[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", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -1490,6 +1464,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" [[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1503,9 +1483,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -1518,9 +1498,9 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bit-set" @@ -1545,18 +1525,18 @@ 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 = "bitmask-enum" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163" +checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" dependencies = [ "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -1573,34 +1553,36 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "block-padding" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ "generic-array", ] [[package]] name = "blocking" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "async-task", - "atomic-waker", - "fastrand", + "fastrand 2.0.1", + "futures-io", "futures-lite", + "piper", + "tracing 0.1.40", ] [[package]] @@ -1618,7 +1600,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bollard-stubs", "bytes 1.5.0", "chrono", @@ -1628,11 +1610,11 @@ dependencies = [ "home", "http", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls 0.24.2", "hyperlocal", "log", "pin-project-lite", - "rustls 0.21.7", + "rustls 0.21.8", "rustls-native-certs", "rustls-pemfile", "rustls-webpki", @@ -1645,7 +1627,7 @@ dependencies = [ "tokio", "tokio-util", "url", - "webpki-roots 0.25.2", + "webpki-roots", "winapi", ] @@ -1658,14 +1640,14 @@ dependencies = [ "chrono", "serde", "serde_repr", - "serde_with 3.3.0", + "serde_with 3.4.0", ] [[package]] name = "borsh" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822462c1e7b17b31961798a6874b36daea6818e99e0cb7d3b7b0fa3c477751c3" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ "borsh-derive", "hashbrown 0.13.1", @@ -1673,52 +1655,52 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37626c9e941a687ee9abef6065b44c379478ae563b7483c613dd705ef1dff59e" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "syn 1.0.109", ] [[package]] name = "borsh-derive-internal" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61820b4c5693eafb998b1e67485423c923db4a75f72585c247bdee32bad81e7b" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "borsh-schema-derive-internal" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76cdbfa13def20d1f8af3ae7b3c6771f06352a74221d8851262ac384c122b8e" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "bson" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aeb8bae494e49dbc330dd23cf78f6f7accee22f640ce3ab17841badaa4ce232" +checksum = "58da0ae1e701ea752cc46c1bb9f39d5ecefc7395c3ecd526261a566d4f16e0c2" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.6", "base64 0.13.1", "bitvec", "hex", "indexmap 1.9.3", "js-sys", - "lazy_static", + "once_cell", "rand 0.8.5", "serde", "serde_bytes", @@ -1740,53 +1722,54 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", - "regex-automata 0.3.8", + "regex-automata 0.4.3", "serde", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", "ptr_meta", + "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "bytemuck" -version = "1.12.3" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -1824,20 +1807,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - -[[package]] name = "cached" -version = "0.45.1" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eb5776f28a149524d1d8623035760b4454ec881e8cf3838fa8d7e1b11254b3" +checksum = "c7c8c50262271cdf5abc979a5f76515c234e764fa025d1ba4862c0f0bcda0e95" dependencies = [ + "ahash 0.8.6", "cached_proc_macro", "cached_proc_macro_types", - "hashbrown 0.13.1", + "hashbrown 0.14.2", "instant", "once_cell", "thiserror", @@ -1845,12 +1823,12 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8245dd5f576a41c3b76247b54c15b0e43139ceeb4f732033e15be7c005176" +checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f" dependencies = [ - "darling 0.14.2", - "proc-macro2 1.0.67", + "darling 0.14.4", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -1863,12 +1841,12 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cargo_toml" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" +checksum = "6ca592ad99e6a0fd4b95153406138b997cc26ccd3cd0aecdfd4fbdbf1519bd77" dependencies = [ "serde", - "toml 0.8.0", + "toml 0.8.6", ] [[package]] @@ -1894,9 +1872,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -1925,9 +1903,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", @@ -1959,9 +1937,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1969,14 +1947,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" dependencies = [ "chrono", "chrono-tz-build", @@ -1986,9 +1964,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf", @@ -1997,9 +1975,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -2008,15 +1986,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -2037,9 +2015,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -2063,9 +2041,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -2073,53 +2051,53 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +checksum = "e5fdbb015d790cfb378aca82caf9cc52a38be96a7eecdb92f31b4366a8afc019" dependencies = [ - "clap 4.4.5", + "clap 4.4.7", "log", ] [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", - "anstyle 1.0.0", + "anstyle", "clap_lex", "strsim 0.10.0", - "terminal_size 0.3.0", + "terminal_size", ] [[package]] name = "clap_complete" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ - "clap 4.4.5", + "clap 4.4.7", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -2134,9 +2112,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -2151,11 +2129,11 @@ dependencies = [ "csv-core", "derivative", "dyn-clone", - "futures 0.3.28", + "futures 0.3.29", "indoc", "memchr", "once_cell", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "prost 0.12.1", "prost-reflect", "regex", @@ -2167,7 +2145,7 @@ dependencies = [ "syslog_loose", "tokio", "tokio-util", - "tracing 0.1.37", + "tracing 0.1.40", "vector-common", "vector-config", "vector-config-common", @@ -2233,12 +2211,12 @@ dependencies = [ [[package]] name = "community-id" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a97e158411823bf87634e2e47552f712e51fa4119cdb2255da799e7cb5c90a9" +checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" dependencies = [ "anyhow", - "base64 0.21.4", + "base64 0.21.5", "hex", "lazy_static", "num_enum 0.6.1", @@ -2247,18 +2225,9 @@ dependencies = [ [[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.0.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -2277,51 +2246,51 @@ dependencies = [ [[package]] name = "console" -version = "0.15.2" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", - "terminal_size 0.1.17", "unicode-width", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "console-api" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ - "prost 0.11.9", - "prost-types 0.11.9", - "tonic 0.9.2", - "tracing-core 0.1.30", + "futures-core", + "prost 0.12.1", + "prost-types 0.12.1", + "tonic 0.10.2", + "tracing-core 0.1.32", ] [[package]] name = "console-subscriber" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" dependencies = [ "console-api", "crossbeam-channel", "crossbeam-utils", - "futures 0.3.28", + "futures-task", "hdrhistogram", "humantime", - "prost-types 0.11.9", + "prost-types 0.12.1", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.9.2", - "tracing 0.1.37", - "tracing-core 0.1.30", + "tonic 0.10.2", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-subscriber", ] @@ -2332,6 +2301,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2364,15 +2339,24 @@ dependencies = [ [[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 = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -2388,15 +2372,15 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" [[package]] name = "crc32c" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ "rustc_version 0.4.0", ] @@ -2419,9 +2403,9 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.5", + "clap 4.4.7", "criterion-plot", - "futures 0.3.28", + "futures 0.3.29", "is-terminal", "itertools 0.10.5", "num-traits", @@ -2450,9 +2434,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -2460,9 +2444,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -2471,14 +2455,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.9.0", "scopeguard", ] @@ -2507,7 +2491,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossterm_winapi", "futures-core", "libc", @@ -2534,6 +2518,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] +name = "crypto-bigint" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2561,9 +2557,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -2573,24 +2569,14 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote 1.0.33", - "syn 1.0.109", -] - -[[package]] name = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2600,80 +2586,31 @@ dependencies = [ ] [[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms 3.0.2", + "platforms 3.1.2", "rustc_version 0.4.0", "subtle", + "zeroize", ] [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.37", -] - -[[package]] -name = "cxx" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.67", - "quote 1.0.33", - "scratch", - "syn 1.0.109", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.82" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2688,12 +2625,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core 0.14.2", - "darling_macro 0.14.2", + "darling_core 0.14.4", + "darling_macro 0.14.4", ] [[package]] @@ -2714,7 +2651,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "strsim 0.10.0", "syn 1.0.109", @@ -2722,13 +2659,13 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "strsim 0.10.0", "syn 1.0.109", @@ -2742,10 +2679,10 @@ checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -2761,11 +2698,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core 0.14.2", + "darling_core 0.14.4", "quote 1.0.33", "syn 1.0.109", ] @@ -2778,17 +2715,23 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + +[[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.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -2802,9 +2745,9 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-url" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[package]] name = "db-key" @@ -2827,9 +2770,9 @@ dependencies = [ [[package]] name = "deadpool-runtime" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" [[package]] name = "debug-helper" @@ -2850,10 +2793,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", ] @@ -2863,20 +2807,20 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -2886,7 +2830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "rustc_version 0.4.0", "syn 1.0.109", @@ -2911,6 +2855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -2934,15 +2879,6 @@ dependencies = [ ] [[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-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2988,13 +2924,13 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0fa3cd8dc96ada974e126a940d37d4079bbbe6a24aca15b1113c2f362441c5" +checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" dependencies = [ "cfg-if", "libc", - "socket2 0.5.4", + "socket2 0.5.5", "windows-sys 0.48.0", ] @@ -3005,7 +2941,7 @@ dependencies = [ "criterion", "data-encoding", "thiserror", - "trust-dns-proto 0.23.0", + "trust-dns-proto 0.23.2", ] [[package]] @@ -3022,7 +2958,7 @@ dependencies = [ "serde", "serde_json", "snafu", - "tracing 0.1.37", + "tracing 0.1.40", "tracing-subscriber", "vector-config", "vector-config-common", @@ -3030,9 +2966,9 @@ dependencies = [ [[package]] name = "duct" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d" +checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" dependencies = [ "libc", "once_cell", @@ -3048,16 +2984,31 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] @@ -3069,21 +3020,44 @@ checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek", "ed25519", + "serde", "sha2", "signature", + "zeroize", ] [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elliptic-curve" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "ena" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" dependencies = [ "log", ] @@ -3133,7 +3107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -3145,9 +3119,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3157,9 +3131,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3177,9 +3151,9 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3213,41 +3187,30 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.27" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +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" @@ -3273,6 +3236,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "pin-project-lite", +] + +[[package]] name = "executor-trait" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3294,7 +3278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -3310,11 +3294,12 @@ dependencies = [ [[package]] name = "fakedata_generator" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6815202b22ccd0dd16957e52e254c52392c84edafb4d3cc0161b9f30a85dbb88" +checksum = "302a45f60d105c247c9d3131107392da80df844f9215260b7f8ccfa301a6a6f4" dependencies = [ - "rand 0.7.3", + "passt", + "rand 0.8.5", "serde", "serde_json", ] @@ -3327,33 +3312,49 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +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 = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" [[package]] name = "file-source" version = "0.1.0" dependencies = [ - "bstr 1.6.2", + "bstr 1.7.0", "bytes 1.5.0", "chrono", "crc", "criterion", "dashmap", "flate2", - "futures 0.3.28", + "futures 0.3.29", "glob", - "indexmap 2.0.0", + "indexmap 2.1.0", "libc", "quickcheck", "scan_fmt", @@ -3362,7 +3363,7 @@ dependencies = [ "similar-asserts", "tempfile", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", "vector-config", "vector-config-common", "vector-config-macros", @@ -3382,24 +3383,10 @@ dependencies = [ ] [[package]] -name = "fix-hidden-lifetime-bug" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ae9c2016a663983d4e40a9ff967d6dcac59819672f0b47f2b17574e99c33c8" -dependencies = [ - "fix-hidden-lifetime-bug-proc_macros", -] - -[[package]] -name = "fix-hidden-lifetime-bug-proc_macros" -version = "0.2.5" +name = "finl_unicode" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", -] +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "fixedbitset" @@ -3409,18 +3396,18 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flagset" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" +checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" [[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 0.7.1", + "miniz_oxide", ] [[package]] @@ -3438,7 +3425,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project", - "spin 0.9.4", + "spin 0.9.8", ] [[package]] @@ -3472,12 +3459,6 @@ dependencies = [ ] [[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] name = "fsevent-sys" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3510,9 +3491,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -3525,9 +3506,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -3535,15 +3516,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -3552,17 +3533,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[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", @@ -3573,26 +3554,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -3602,9 +3583,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3657,9 +3638,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -3682,12 +3663,12 @@ dependencies = [ [[package]] name = "goauth" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" +checksum = "d351469a584f3b3565e2e740d4da60839bddc4320dadd7d61da8bdd77ffb373b" dependencies = [ "arc-swap", - "futures 0.3.28", + "futures 0.3.29", "log", "reqwest", "serde", @@ -3707,7 +3688,7 @@ checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" dependencies = [ "cfg-if", "dashmap", - "futures 0.3.28", + "futures 0.3.29", "futures-timer", "no-std-compat", "nonzero_ext", @@ -3756,7 +3737,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "serde", "serde_json", @@ -3770,7 +3751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "syn 1.0.109", ] @@ -3793,7 +3774,7 @@ source = "git+https://github.com/GreptimeTeam/greptimedb-client-rust.git?rev=bc3 dependencies = [ "dashmap", "enum_dispatch", - "futures 0.3.28", + "futures 0.3.29", "futures-util", "greptime-proto", "parking_lot", @@ -3818,6 +3799,17 @@ dependencies = [ ] [[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "h2" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3833,7 +3825,7 @@ dependencies = [ "slab", "tokio", "tokio-util", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -3854,7 +3846,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -3863,16 +3855,17 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.6", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.6", + "allocator-api2", ] [[package]] @@ -3895,7 +3888,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "headers-core", "http", @@ -3954,7 +3947,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "nix 0.23.1", + "nix 0.23.2", "pin-utils", "uom", "winapi", @@ -3966,7 +3959,7 @@ version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ "cfg-if", - "futures 0.3.28", + "futures 0.3.29", "glob", "heim-common", "heim-runtime", @@ -4036,7 +4029,7 @@ dependencies = [ "heim-runtime", "libc", "macaddr", - "nix 0.23.1", + "nix 0.23.2", "widestring 0.4.3", "winapi", ] @@ -4046,7 +4039,7 @@ name = "heim-runtime" version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-timer", "once_cell", "smol", @@ -4063,9 +4056,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -4074,6 +4067,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4126,9 +4128,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "http-serde" @@ -4169,9 +4171,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -4196,10 +4198,10 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", "want", ] @@ -4228,7 +4230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ "bytes 1.5.0", - "futures 0.3.28", + "futures 0.3.29", "headers", "http", "hyper", @@ -4240,14 +4242,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", "log", - "rustls 0.20.7", + "rustls 0.20.9", "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", @@ -4255,14 +4257,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.21.7", + "rustls 0.21.8", "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", @@ -4308,26 +4311,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -4370,12 +4372,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "serde", ] @@ -4452,9 +4454,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" +checksum = "0508c56cfe9bfd5dfeb0c22ab9a6abfda2f27bdca422132e494266351ed8d83c" [[package]] name = "io-lifetimes" @@ -4462,7 +4464,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -4478,21 +4480,21 @@ dependencies = [ [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.4.9", - "widestring 0.5.1", - "winapi", - "winreg 0.10.1", + "socket2 0.5.5", + "widestring 1.0.2", + "windows-sys 0.48.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.5.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" @@ -4505,13 +4507,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.19", + "hermit-abi 0.3.3", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -4541,9 +4542,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" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -4569,27 +4570,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" dependencies = [ "serde", "serde_json", @@ -4613,7 +4614,7 @@ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ "env_logger 0.10.0", - "futures 0.3.28", + "futures 0.3.29", "indoc", "k8s-openapi 0.16.0", "k8s-test-framework", @@ -4622,7 +4623,7 @@ dependencies = [ "reqwest", "serde_json", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -4645,7 +4646,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "chrono", "http", @@ -4669,18 +4670,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] [[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", @@ -4688,9 +4689,9 @@ 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 1.3.2", "libc", @@ -4707,9 +4708,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.82.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca82ee1786dc8770d1ad4e319003e3d68cd86bc1204ed9e40f591ffef8e6492c" +checksum = "dc7d3d52dd5c871991679102e80dfb192faaaa09fecdbccdd8c55af264ce7a8f" dependencies = [ "k8s-openapi 0.18.0", "kube-client", @@ -4719,16 +4720,16 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.82.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b1d8deb705ef2463b2ce142b0ff98c815f8f0ac393d13c8f4c2b26491daf66" +checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", "bytes 1.5.0", "chrono", "dirs-next", "either", - "futures 0.3.28", + "futures 0.3.29", "http", "http-body", "hyper", @@ -4738,25 +4739,25 @@ dependencies = [ "k8s-openapi 0.18.0", "kube-core", "openssl", - "pem", + "pem 1.1.1", "pin-project", "secrecy", "serde", "serde_json", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "thiserror", "tokio", "tokio-util", "tower", "tower-http", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] name = "kube-core" -version = "0.82.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16c1653fd0bda69a6bdb363167edbb72d28817db340d2fe8cb89dc07d354e05" +checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", @@ -4771,15 +4772,15 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.82.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8442b2f1d6c1d630677ade9e5d5ebe793dec099a75fb582d56d77b8eb8cee8" +checksum = "125331201e3073707ac79c294c89021faa76c84da3a566a3749a2a93d295c98a" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.6", "async-trait", "backoff", "derivative", - "futures 0.3.28", + "futures 0.3.29", "json-patch", "k8s-openapi 0.18.0", "kube-client", @@ -4791,7 +4792,7 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -4840,7 +4841,7 @@ dependencies = [ "pinky-swear", "reactor-trait", "serde", - "tracing 0.1.37", + "tracing 0.1.40", "waker-fn", ] @@ -4849,44 +4850,51 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "libc" -version = "0.2.148" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libflate" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" dependencies = [ + "core2", + "hashbrown 0.13.1", "rle-decode-fast", ] [[package]] name = "libm" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -4895,15 +4903,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] - -[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4926,9 +4925,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "listenfd" @@ -4943,9 +4942,9 @@ dependencies = [ [[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", @@ -4953,9 +4952,9 @@ dependencies = [ [[package]] name = "lockfree-object-pool" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8166fbddef141acbea89cf3425ed97d4c22d14a68161977fc01c301175a4fb89" +checksum = "ee33defb27b106378a6efcfcde4dda6226dfdac8ba7a2904f5bc93363cb88557" [[package]] name = "log" @@ -4983,9 +4982,12 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +dependencies = [ + "hashbrown 0.14.2", +] [[package]] name = "lru-cache" @@ -4998,9 +5000,9 @@ dependencies = [ [[package]] name = "lua-src" -version = "546.0.0" +version = "546.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb00c1380f1b4b4928dd211c07301ffa34872a239e590bd3219d9e5b213face" +checksum = "7c26d4af78361e025a3d03a2b964cd1592aff7495f4d4f7947218c084c6fdca8" dependencies = [ "cc", ] @@ -5085,22 +5087,23 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[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", ] @@ -5128,15 +5131,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -5160,12 +5163,21 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "metrics" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.6", "metrics-macros", "portable-atomic", ] @@ -5176,9 +5188,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -5192,8 +5204,8 @@ dependencies = [ "metrics", "metrics-util", "once_cell", - "tracing 0.1.37", - "tracing-core 0.1.30", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-subscriber", ] @@ -5210,8 +5222,8 @@ dependencies = [ "indexmap 1.9.3", "metrics", "num_cpus", - "ordered-float 3.9.1", - "quanta", + "ordered-float 3.9.2", + "quanta 0.11.1", "radix_trie", "sketches-ddsketch", ] @@ -5240,15 +5252,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -5258,9 +5261,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -5274,7 +5277,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c3a7a7ff4481ec91b951a733390211a8ace1caba57266ccb5f4d4966704e560" dependencies = [ - "bstr 1.6.2", + "bstr 1.7.0", "mlua-sys", "mlua_derive", "num-traits", @@ -5304,10 +5307,10 @@ dependencies = [ "itertools 0.11.0", "once_cell", "proc-macro-error", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "regex", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -5318,9 +5321,9 @@ checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" [[package]] name = "mongodb" -version = "2.6.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" +checksum = "e7c926772050c3a3f87c837626bf6135c8ca688d91d31dd39a3da547fc2bc9fe" dependencies = [ "async-trait", "base64 0.13.1", @@ -5341,33 +5344,33 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.7", + "rustls 0.21.8", "rustls-pemfile", "serde", "serde_bytes", "serde_with 1.14.0", "sha-1", "sha2", - "socket2 0.4.9", + "socket2 0.4.10", "stringprep", "strsim 0.10.0", "take_mut", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.1", "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver", "typed-builder 0.10.0", "uuid", - "webpki-roots 0.22.5", + "webpki-roots", ] [[package]] name = "multer" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" dependencies = [ "bytes 1.5.0", "encoding_rs", @@ -5377,7 +5380,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.4", + "spin 0.9.8", "version_check", ] @@ -5456,9 +5459,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ "bitflags 1.3.2", "cc", @@ -5542,7 +5545,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "filetime", "fsevent-sys", "inotify", @@ -5583,9 +5586,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -5593,10 +5596,27 @@ dependencies = [ ] [[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -5623,6 +5643,17 @@ dependencies = [ ] [[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.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5635,9 +5666,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -5645,11 +5676,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.3.3", "libc", ] @@ -5673,11 +5704,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ - "num_enum_derive 0.7.0", + "num_enum_derive 0.7.1", ] [[package]] @@ -5686,8 +5717,8 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.67", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -5698,22 +5729,22 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.67", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.67", + "proc-macro-crate 2.0.0", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -5733,9 +5764,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "oauth2" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaf26a72311c087f8c5ba617c96fac67a5c04f430e716ac8d8ab2de62e23368" +checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", @@ -5762,9 +5793,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -5820,19 +5851,19 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendal" -version = "0.38.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df645b6012162c04c8949e9b96ae2ef002e79189cfb154e507e51ac5be76a09" +checksum = "e31b48f0af6de5b3b344c1acc1e06c4581dca3e13cd5ba05269927fc2abf953a" dependencies = [ "anyhow", "async-compat", "async-trait", "backon", - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "chrono", "flagset", - "futures 0.3.28", + "futures 0.3.29", "http", "hyper", "log", @@ -5841,7 +5872,7 @@ dependencies = [ "parking_lot", "percent-encoding", "pin-project", - "quick-xml 0.27.1", + "quick-xml 0.30.0", "reqwest", "serde", "serde_json", @@ -5851,35 +5882,43 @@ dependencies = [ [[package]] name = "openidconnect" -version = "2.4.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87af7097640fedbe64718ac1c9b0549d72da747a3f527cd089215f96c6f691d5" +checksum = "62d6050f6a84b81f23c569f5607ad883293e57491036e318fafe6fc4895fadb1" dependencies = [ "base64 0.13.1", "chrono", + "dyn-clone", + "ed25519-dalek", + "hmac", "http", "itertools 0.10.5", "log", - "num-bigint", "oauth2", + "p256", + "p384", "rand 0.8.5", - "ring 0.16.20", + "rsa", "serde", "serde-value", "serde_derive", "serde_json", "serde_path_to_error", + "serde_plain", + "serde_with 3.4.0", + "sha2", + "subtle", "thiserror", "url", ] [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -5890,13 +5929,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -5907,18 +5946,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.5+3.1.3" +version = "300.1.6+3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" +checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -5934,11 +5973,11 @@ dependencies = [ "bytes 1.5.0", "chrono", "hex", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "prost 0.12.1", "prost-build 0.12.1", - "tonic 0.10.1", - "tonic-build 0.10.1", + "tonic 0.10.2", + "tonic-build 0.10.2", "vector-core", "vector-lookup", "vrl", @@ -5952,27 +5991,27 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] [[package]] name = "ordered-float" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" dependencies = [ "num-traits", ] @@ -5989,21 +6028,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "0.9.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -6028,6 +6058,30 @@ dependencies = [ ] [[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] name = "pad" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6038,9 +6092,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -6054,15 +6108,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 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -6075,6 +6129,12 @@ dependencies = [ ] [[package]] +name = "passt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13242a5ce97f39a8095d03c8b273e91d09f2690c0b7d69a2af844941115bab24" + +[[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6097,14 +6157,24 @@ checksum = "9e9ed2178b0575fff8e1b83b58ba6f75e727aafac2e1b6c795169ad3b17eb518" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] [[package]] +name = "pem" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +dependencies = [ + "base64 0.21.5", + "serde", +] + +[[package]] name = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6121,9 +6191,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", "thiserror", @@ -6132,9 +6202,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -6142,22 +6212,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", @@ -6166,40 +6236,40 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.1.0", ] [[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_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[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 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -6214,9 +6284,9 @@ dependencies = [ [[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", ] @@ -6236,16 +6306,16 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -6262,7 +6332,29 @@ dependencies = [ "doc-comment", "flume", "parking_lot", - "tracing 0.1.37", + "tracing 0.1.40", +] + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", ] [[package]] @@ -6277,9 +6369,9 @@ dependencies = [ [[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 = "platforms" @@ -6289,15 +6381,15 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "platforms" -version = "3.0.2" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -6308,31 +6400,47 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d73f1eaed1ca1fb37b54dcc9b38e3b17d6c7b8ecb7abfffcac8d0351f17d4" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing 0.1.40", + "windows-sys 0.48.0", ] [[package]] @@ -6348,9 +6456,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbda379e6e462c97ea6afe9f6233619b202bbc4968d7caa6917788d2070a044" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "portpicker" @@ -6365,7 +6473,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "openssl", "tokio", "tokio-openssl", @@ -6378,7 +6486,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "byteorder", "bytes 1.5.0", "fallible-iterator", @@ -6403,6 +6511,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6416,13 +6530,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ - "anstyle 0.3.1", + "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -6434,9 +6548,9 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -6444,13 +6558,11 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -6468,22 +6580,22 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "syn 1.0.109", ] [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.67", - "syn 2.0.37", + "proc-macro2 1.0.69", + "syn 2.0.39", ] [[package]] @@ -6501,6 +6613,15 @@ dependencies = [ ] [[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] name = "proc-macro-crate" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6511,13 +6632,21 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml 0.5.11", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -6527,7 +6656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "version_check", @@ -6539,16 +6668,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "version_check", ] [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro-nested" @@ -6567,9 +6696,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -6578,9 +6707,9 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "nom", - "num_enum 0.7.0", + "num_enum 0.7.1", "prost 0.12.1", "prost-build 0.12.1", "prost-types 0.12.1", @@ -6590,19 +6719,19 @@ dependencies = [ [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rusty-fork", "tempfile", "unarray", @@ -6641,7 +6770,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease 0.1.21", + "prettyplease 0.1.25", "prost 0.11.9", "prost-types 0.11.9", "regex", @@ -6663,11 +6792,11 @@ dependencies = [ "multimap", "once_cell", "petgraph", - "prettyplease 0.2.12", + "prettyplease 0.2.15", "prost 0.12.1", "prost-types 0.12.1", "regex", - "syn 2.0.37", + "syn 2.0.39", "tempfile", "which", ] @@ -6680,7 +6809,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -6693,9 +6822,9 @@ checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", "itertools 0.11.0", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -6704,7 +6833,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "once_cell", "prost 0.12.1", "prost-types 0.12.1", @@ -6745,16 +6874,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "pulsar" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6eb95b2e36b92d3e0536be87eaf7accb17db39f5a44452759b43f1328e82dc9" +checksum = "5d21c6a837986cf25d22ac5b951c267d95808f3c830ff009c2879fff259a0268" dependencies = [ "async-trait", "bit-vec", @@ -6763,7 +6892,7 @@ dependencies = [ "crc", "data-url", "flate2", - "futures 0.3.28", + "futures 0.3.29", "futures-io", "futures-timer", "log", @@ -6772,7 +6901,7 @@ dependencies = [ "nom", "oauth2", "openidconnect", - "pem", + "pem 3.0.2", "prost 0.11.9", "prost-build 0.11.9", "prost-derive 0.11.9", @@ -6786,7 +6915,7 @@ dependencies = [ "tokio-util", "url", "uuid", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -6805,7 +6934,23 @@ dependencies = [ "libc", "mach2", "once_cell", - "raw-cpuid", + "raw-cpuid 10.7.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quanta" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "577c55a090a94ed7da0e6580cc38a553558e2d736398b5d8ebf81bc9880f8acd" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid 11.0.1", "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", @@ -6819,9 +6964,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", "serde", @@ -6829,9 +6974,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", @@ -6854,7 +6999,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -6874,7 +7019,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", ] [[package]] @@ -6991,15 +7136,16 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cassowary", "crossterm", "indoc", "itertools 0.11.0", + "lru", "paste", "strum", "unicode-segmentation", @@ -7008,23 +7154,29 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.6.0" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ "bitflags 1.3.2", ] [[package]] -name = "raw-window-handle" -version = "0.5.0" +name = "raw-cpuid" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" dependencies = [ - "cty", + "bitflags 2.4.1", ] [[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] name = "rawpointer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7032,25 +7184,22 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -7108,7 +7257,7 @@ dependencies = [ "async-trait", "bytes 1.5.0", "combine 4.6.6", - "futures 0.3.28", + "futures 0.3.29", "futures-util", "itoa", "native-tls", @@ -7141,6 +7290,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" @@ -7153,14 +7311,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -7174,16 +7332,22 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7196,6 +7360,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "relative-path" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7203,20 +7373,20 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "rend" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "encoding_rs", "futures-core", @@ -7225,7 +7395,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls 0.24.2", "hyper-tls", "ipnet", "js-sys", @@ -7235,11 +7405,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls 0.21.8", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -7250,8 +7421,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", - "winreg 0.50.0", + "webpki-roots", + "winreg", ] [[package]] @@ -7271,6 +7442,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" [[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7287,39 +7468,42 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", "getrandom 0.2.10", "libc", - "spin 0.9.4", + "spin 0.9.8", "untrusted 0.9.0", "windows-sys 0.48.0", ] [[package]] name = "rkyv" -version = "0.7.40" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", "bytecheck", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.40" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -7332,9 +7516,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" dependencies = [ "byteorder", "num-traits", @@ -7386,20 +7570,40 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] [[package]] +name = "rsa" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] name = "rstest" version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-timer", "rstest_macros", "rustc_version 0.4.0", @@ -7413,25 +7617,23 @@ checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.37", + "syn 2.0.39", "unicode-ident", ] [[package]] name = "rust_decimal" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" +checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" dependencies = [ "arrayvec", "borsh", - "bytecheck", - "byteorder", "bytes 1.5.0", "num-traits", "rand 0.8.5", @@ -7467,7 +7669,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] @@ -7482,9 +7684,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -7496,22 +7698,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", @@ -7521,12 +7723,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", - "ring 0.16.20", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -7549,24 +7751,24 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -7586,7 +7788,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "clipboard-win", "libc", @@ -7663,24 +7865,18 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -7690,6 +7886,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] name = "secrecy" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7714,9 +7924,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -7733,9 +7943,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -7748,20 +7958,20 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde-toml-merge" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250c08954c1c279a877fd44909e7c50d366082d301d23821353f8b9327baf648" +checksum = "af5ae5f42c16d60b098ae5d4afd75c1d3b6512e6ca5d0b9b916e2ced30df264c" dependencies = [ - "toml 0.8.0", + "toml 0.8.6", ] [[package]] @@ -7770,15 +7980,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float 2.10.0", + "ordered-float 2.10.1", "serde", ] [[package]] name = "serde-wasm-bindgen" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" +checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" dependencies = [ "js-sys", "serde", @@ -7796,13 +8006,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -7811,18 +8021,18 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -7839,9 +8049,19 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.8" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" dependencies = [ "serde", ] @@ -7859,20 +8079,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -7901,18 +8121,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_json", - "serde_with_macros 3.3.0", + "serde_with_macros 3.4.0", "time", ] @@ -7923,21 +8143,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling 0.20.3", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -7954,11 +8174,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -7978,9 +8198,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -7989,9 +8209,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -8000,9 +8220,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest", "keccak", @@ -8010,18 +8230,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 = "shared_child" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" dependencies = [ "libc", "winapi", @@ -8050,9 +8270,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -8076,6 +8296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ "digest", + "rand_core 0.6.4", ] [[package]] @@ -8088,10 +8309,16 @@ dependencies = [ ] [[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[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", @@ -8115,21 +8342,21 @@ checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" [[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 = "sketches-ddsketch" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" +checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -8145,29 +8372,28 @@ dependencies = [ [[package]] name = "smol" -version = "1.2.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ "async-channel", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", "futures-lite", - "once_cell", ] [[package]] name = "smpl_jwt" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" +checksum = "fff23fdd767425c13e6f354b7443b3cc0c23097ae077e2211ef8143fa68ad014" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", "log", "openssl", "serde", @@ -8196,7 +8422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -8209,9 +8435,9 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[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", @@ -8219,9 +8445,9 @@ 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 0.48.0", @@ -8235,9 +8461,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -8277,9 +8503,9 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", @@ -8290,10 +8516,11 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -8338,7 +8565,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -8354,22 +8581,22 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "rustversion", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" @@ -8398,27 +8625,27 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.37" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "syslog" @@ -8444,6 +8671,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8457,9 +8705,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tcp-stream" -version = "0.24.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a4b0a70bac0a58ca6a7659d1328e34ee462339c70b0fa49f72bad1f278910a" +checksum = "4da30af7998f51ee1aa48ab24276fe303a697b004e31ff542b192c088d5630a5" dependencies = [ "cfg-if", "native-tls", @@ -8474,15 +8722,14 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.19", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -8499,38 +8746,28 @@ dependencies = [ [[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 = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "terminal_size" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.14", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-generator" @@ -8555,41 +8792,41 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -8605,14 +8842,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "js-sys", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -8620,15 +8859,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -8663,15 +8902,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +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 1.5.0", @@ -8681,9 +8920,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", - "tracing 0.1.37", + "tracing 0.1.40", "windows-sys 0.48.0", ] @@ -8714,16 +8953,16 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -8761,7 +9000,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.4", + "socket2 0.5.5", "tokio", "tokio-util", "whoami", @@ -8784,7 +9023,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.7", + "rustls 0.20.9", "tokio", "webpki", ] @@ -8795,7 +9034,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls 0.21.8", "tokio", ] @@ -8832,7 +9071,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.7", + "rustls 0.21.8", "tokio", "tungstenite", ] @@ -8849,7 +9088,7 @@ dependencies = [ "pin-project-lite", "slab", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -8863,32 +9102,43 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -8904,7 +9154,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "futures-core", "futures-util", @@ -8923,19 +9173,19 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] name = "tonic" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c00bc15e49625f3d2f20b17082601e5e17cf27ead69e805174026c194b6664" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "flate2", "h2", @@ -8946,7 +9196,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.1", - "rustls 0.21.7", + "rustls 0.21.8", "rustls-native-certs", "rustls-pemfile", "tokio", @@ -8955,7 +9205,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -8964,8 +9214,8 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease 0.1.21", - "proc-macro2 1.0.67", + "prettyplease 0.1.25", + "proc-macro2 1.0.69", "prost-build 0.11.9", "quote 1.0.33", "syn 1.0.109", @@ -8973,15 +9223,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d37bb15da06ae9bb945963066baca6561b505af93a52e949a85d28558459a2" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ - "prettyplease 0.2.12", - "proc-macro2 1.0.67", + "prettyplease 0.2.15", + "proc-macro2 1.0.69", "prost-build 0.12.1", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -9001,7 +9251,7 @@ dependencies = [ "tokio-util", "tower-layer", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -9011,8 +9261,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", - "base64 0.21.4", - "bitflags 2.4.0", + "base64 0.21.5", + "bitflags 2.4.1", "bytes 1.5.0", "futures-core", "futures-util", @@ -9025,7 +9275,7 @@ dependencies = [ "tokio-util", "tower-layer", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -9056,15 +9306,14 @@ 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", "log", "pin-project-lite", "tracing-attributes", - "tracing-core 0.1.30", + "tracing-core 0.1.32", ] [[package]] @@ -9079,20 +9328,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 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 1.0.109", + "syn 2.0.39", ] [[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", @@ -9112,8 +9361,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12de1a8c6bcfee614305e836308b596bbac831137a04c61f7e5b0b0bf2cfeaf6" dependencies = [ - "tracing 0.1.37", - "tracing-core 0.1.30", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-subscriber", ] @@ -9123,10 +9372,10 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-task", "pin-project", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -9145,20 +9394,20 @@ dependencies = [ "criterion", "dashmap", "mock_instant", - "tracing 0.1.37", - "tracing-core 0.1.30", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-subscriber", ] [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", - "tracing-core 0.1.30", + "once_cell", + "tracing-core 0.1.32", ] [[package]] @@ -9168,7 +9417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", - "tracing-core 0.1.30", + "tracing-core 0.1.32", ] [[package]] @@ -9185,8 +9434,8 @@ dependencies = [ "serde_json", "sharded-slab", "thread_local", - "tracing 0.1.37", - "tracing-core 0.1.30", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-log", "tracing-serde", ] @@ -9196,7 +9445,7 @@ name = "tracing-tower" version = "0.1.0" source = "git+https://github.com/tokio-rs/tracing?rev=e0642d949891546a3bb7e47080365ee7274f05cd#e0642d949891546a3bb7e47080365ee7274f05cd" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "tower-service", "tracing 0.2.0", "tracing-futures 0.3.0", @@ -9238,9 +9487,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if", @@ -9257,7 +9506,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", "url", ] @@ -9283,9 +9532,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" @@ -9322,27 +9571,36 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "typed-builder" -version = "0.14.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870" +checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" dependencies = [ - "proc-macro2 1.0.67", + "typed-builder-macro", +] + +[[package]] +name = "typed-builder-macro" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" +dependencies = [ + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" @@ -9363,9 +9621,18 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfc13d450dc4a695200da3074dacf43d449b968baee95e341920e47f61a3b40f" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", +] + +[[package]] +name = "tz-rs" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4" +dependencies = [ + "const_fn", ] [[package]] @@ -9384,9 +9651,9 @@ dependencies = [ [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unarray" @@ -9396,9 +9663,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -9411,9 +9678,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -9426,15 +9693,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -9469,9 +9736,9 @@ dependencies = [ [[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" @@ -9510,9 +9777,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf-8" @@ -9534,9 +9801,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[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", "rand 0.8.5", @@ -9561,10 +9828,9 @@ name = "vdev" version = "0.1.0" dependencies = [ "anyhow", - "atty", "cached", "chrono", - "clap 4.4.5", + "clap 4.4.7", "clap-verbosity-flag", "clap_complete", "confy", @@ -9572,7 +9838,7 @@ dependencies = [ "dunce", "glob", "hex", - "indexmap 2.0.0", + "indexmap 2.1.0", "indicatif", "itertools 0.11.0", "log", @@ -9584,10 +9850,10 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "sha2", "tempfile", - "toml 0.8.0", + "toml 0.8.6", ] [[package]] @@ -9598,7 +9864,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.33.1" +version = "0.34.0" dependencies = [ "apache-avro", "approx", @@ -9606,12 +9872,11 @@ dependencies = [ "arr_macro", "assert_cmd", "async-compression", - "async-graphql 6.0.0", + "async-graphql", "async-graphql-warp", "async-nats", "async-stream", "async-trait", - "atty", "aws-config", "aws-credential-types", "aws-sdk-cloudwatch", @@ -9634,15 +9899,14 @@ dependencies = [ "azure_identity", "azure_storage", "azure_storage_blobs", - "base64 0.21.4", + "base64 0.21.5", "bloomy", "bollard", "bytes 1.5.0", "bytesize", "chrono", "cidr-utils", - "clap 4.4.5", - "codecs", + "clap 4.4.7", "colored", "console-subscriber", "criterion", @@ -9653,13 +9917,11 @@ dependencies = [ "dnsmsg-parser", "dyn-clone", "encoding_rs", - "enrichment", "enum_dispatch", "exitcode", "fakedata", - "file-source", "flate2", - "futures 0.3.28", + "futures 0.3.29", "futures-util", "glob", "goauth", @@ -9668,7 +9930,7 @@ dependencies = [ "grok", "h2", "hash_hasher", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "headers", "heim", "hex", @@ -9679,7 +9941,7 @@ dependencies = [ "hyper", "hyper-openssl", "hyper-proxy", - "indexmap 2.0.0", + "indexmap 2.1.0", "indoc", "infer 0.15.0", "inventory", @@ -9709,14 +9971,12 @@ dependencies = [ "openssl", "openssl-probe", "openssl-src", - "opentelemetry-proto", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "paste", "percent-encoding", "pin-project", "portpicker", "postgres-openssl", - "prometheus-parser", "proptest", "prost 0.12.1", "prost-build 0.12.1", @@ -9736,20 +9996,20 @@ dependencies = [ "roaring", "rstest", "seahash", - "semver 1.0.18", + "semver 1.0.20", "serde", "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 3.3.0", - "serde_yaml 0.9.25", + "serde_with 3.4.0", + "serde_yaml 0.9.27", "sha2", "similar-asserts", "smallvec", "smpl_jwt", "snafu", "snap", - "socket2 0.5.4", + "socket2 0.5.5", "stream-cancel", "strip-ansi-escapes", "syslog", @@ -9763,36 +10023,29 @@ dependencies = [ "tokio-test", "tokio-tungstenite", "tokio-util", - "toml 0.8.0", - "tonic 0.10.1", - "tonic-build 0.10.1", + "toml 0.8.6", + "tonic 0.10.2", + "tonic-build 0.10.2", "tower", "tower-http", "tower-test", - "tracing 0.1.37", - "tracing-core 0.1.30", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-futures 0.2.5", "tracing-limit", "tracing-subscriber", "tracing-tower", - "trust-dns-proto 0.23.0", + "trust-dns-proto 0.23.2", "typetag", "url", "uuid", - "vector-api-client", - "vector-buffers", - "vector-common", - "vector-config", - "vector-config-common", - "vector-config-macros", - "vector-core", - "vector-lookup", + "vector-lib", "vector-vrl-functions", "vrl", "warp", "windows-service", "wiremock", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] @@ -9802,8 +10055,8 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.4.5", - "futures 0.3.28", + "clap 4.4.7", + "futures 0.3.29", "graphql_client", "indoc", "reqwest", @@ -9825,13 +10078,13 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.5.0", - "clap 4.4.5", + "clap 4.4.7", "crc32fast", "criterion", "crossbeam-queue", "crossbeam-utils", "fslock", - "futures 0.3.28", + "futures 0.3.29", "hdrhistogram", "memmap2", "metrics", @@ -9845,13 +10098,13 @@ dependencies = [ "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "snafu", "temp-dir", "tokio", "tokio-test", "tokio-util", - "tracing 0.1.37", + "tracing 0.1.40", "tracing-fluent-assertions", "tracing-subscriber", "vector-common", @@ -9870,11 +10123,11 @@ dependencies = [ "chrono-tz", "crossbeam-utils", "derivative", - "futures 0.3.28", - "indexmap 2.0.0", + "futures 0.3.29", + "indexmap 2.1.0", "metrics", "nom", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "paste", "pin-project", "quickcheck", @@ -9886,7 +10139,7 @@ dependencies = [ "snafu", "stream-cancel", "tokio", - "tracing 0.1.37", + "tracing 0.1.40", "vector-config", "vector-config-common", "vector-config-macros", @@ -9902,16 +10155,16 @@ dependencies = [ "chrono-tz", "encoding_rs", "http", - "indexmap 2.0.0", + "indexmap 2.1.0", "inventory", "no-proxy", "num-traits", "serde", "serde_json", - "serde_with 3.3.0", + "serde_with 3.4.0", "snafu", - "toml 0.8.0", - "tracing 0.1.37", + "toml 0.8.6", + "tracing 0.1.40", "url", "vector-config-common", "vector-config-macros", @@ -9926,12 +10179,12 @@ dependencies = [ "convert_case 0.6.0", "darling 0.20.3", "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "serde", "serde_json", - "syn 2.0.37", - "tracing 0.1.37", + "syn 2.0.39", + "tracing 0.1.40", ] [[package]] @@ -9939,11 +10192,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.3", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "serde", "serde_derive_internals", - "syn 2.0.37", + "syn 2.0.39", "vector-config", "vector-config-common", ] @@ -9952,10 +10205,9 @@ dependencies = [ name = "vector-core" version = "0.1.0" dependencies = [ - "async-graphql 5.0.10", - "async-stream", + "async-graphql", "async-trait", - "base64 0.21.4", + "base64 0.21.5", "bitmask-enum", "bytes 1.5.0", "chrono", @@ -9968,12 +10220,12 @@ dependencies = [ "enumflags2", "env-test-util", "float_eq", - "futures 0.3.28", + "futures 0.3.29", "futures-util", "headers", "http", "hyper-proxy", - "indexmap 2.0.0", + "indexmap 2.1.0", "metrics", "metrics-tracing-context", "metrics-util", @@ -9984,14 +10236,14 @@ dependencies = [ "noisy_float", "once_cell", "openssl", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "parking_lot", "pin-project", "proptest", "prost 0.12.1", "prost-build 0.12.1", "prost-types 0.12.1", - "quanta", + "quanta 0.12.1", "quickcheck", "quickcheck_macros", "rand 0.8.5", @@ -10002,24 +10254,21 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 3.3.0", + "serde_with 3.4.0", "similar-asserts", "smallvec", "snafu", - "socket2 0.5.4", + "socket2 0.5.5", "tokio", "tokio-openssl", "tokio-stream", "tokio-test", "tokio-util", - "toml 0.8.0", - "tonic 0.10.1", - "tower", - "tracing 0.1.37", - "tracing-core 0.1.30", - "tracing-log", + "toml 0.8.6", + "tonic 0.10.2", + "tracing 0.1.40", + "tracing-core 0.1.32", "tracing-subscriber", - "twox-hash", "typetag", "url", "vector-buffers", @@ -10032,6 +10281,24 @@ dependencies = [ ] [[package]] +name = "vector-lib" +version = "0.1.0" +dependencies = [ + "codecs", + "enrichment", + "file-source", + "opentelemetry-proto", + "prometheus-parser", + "vector-api-client", + "vector-buffers", + "vector-common", + "vector-config", + "vector-core", + "vector-lookup", + "vector-stream", +] + +[[package]] name = "vector-lookup" version = "0.1.0" dependencies = [ @@ -10042,10 +10309,30 @@ dependencies = [ ] [[package]] +name = "vector-stream" +version = "0.1.0" +dependencies = [ + "async-stream", + "futures 0.3.29", + "futures-util", + "pin-project", + "proptest", + "rand 0.8.5", + "rand_distr", + "tokio", + "tokio-util", + "tower", + "tracing 0.1.40", + "twox-hash", + "vector-common", + "vector-core", +] + +[[package]] name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.4.5", + "clap 4.4.7", "vector-vrl-functions", "vrl", ] @@ -10064,7 +10351,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.4.5", + "clap 4.4.7", "enrichment", "glob", "prettydiff", @@ -10106,16 +10393,16 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d3c3ffe5322a8a7f63cf422aebb5000774e4152955fca1cd024c262893db5d" +checksum = "a8a93ee342590c4df0ff63961d7d76a347e0c7b6e6c0be4c001317ca1ff11b53" dependencies = [ "aes", "ansi_term", "anymap", "arbitrary", "base16", - "base64 0.21.4", + "base64 0.21.5", "bytes 1.5.0", "cbc", "cfb-mode", @@ -10125,7 +10412,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils", - "clap 4.4.5", + "clap 4.4.7", "codespan-reporting", "community-id", "crypto_secretbox", @@ -10140,7 +10427,7 @@ dependencies = [ "hex", "hmac", "hostname", - "indexmap 2.0.0", + "indexmap 2.1.0", "indoc", "itertools 0.11.0", "lalrpop", @@ -10151,7 +10438,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 4.1.0", + "ordered-float 4.1.1", "paste", "peeking_take_while", "percent-encoding", @@ -10163,7 +10450,7 @@ dependencies = [ "quoted_printable", "rand 0.8.5", "regex", - "roxmltree 0.18.0", + "roxmltree 0.18.1", "rust_decimal", "rustyline", "seahash", @@ -10177,14 +10464,14 @@ dependencies = [ "syslog_loose", "termcolor", "thiserror", - "tracing 0.1.37", + "tracing 0.1.40", "uaparser", "url", "utf8-width", "uuid", "webbrowser", "woothee", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] @@ -10203,7 +10490,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", ] @@ -10218,28 +10505,26 @@ dependencies = [ [[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.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", - "winapi", "winapi-util", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -10270,7 +10555,7 @@ dependencies = [ "tokio-tungstenite", "tokio-util", "tower-service", - "tracing 0.1.37", + "tracing 0.1.40", ] [[package]] @@ -10287,9 +10572,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -10297,24 +10582,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -10324,9 +10609,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote 1.0.33", "wasm-bindgen-macro-support", @@ -10334,22 +10619,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" @@ -10366,9 +10651,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -10376,12 +10661,12 @@ 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", "log", "ndk-context", @@ -10397,35 +10682,17 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.3", + "ring 0.17.5", "untrusted 0.9.0", ] [[package]] name = "webpki-roots" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - -[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10434,7 +10701,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.14", + "rustix 0.38.21", ] [[package]] @@ -10455,12 +10722,6 @@ checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" [[package]] name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - -[[package]] -name = "widestring" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" @@ -10483,9 +10744,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", ] @@ -10497,6 +10758,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] name = "windows-service" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10509,26 +10779,11 @@ dependencies = [ [[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.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[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.1", + "windows-targets 0.42.2", ] [[package]] @@ -10537,143 +10792,134 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "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" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "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.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" @@ -10684,15 +10930,15 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.19" +version = "0.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" +checksum = "079aee011e8a8e625d16df9e785de30a6b77f80a6126092d76a57375f96448da" dependencies = [ "assert-json-diff 2.0.2", "async-trait", - "base64 0.21.4", + "base64 0.21.5", "deadpool", - "futures 0.3.28", + "futures 0.3.29", "futures-timer", "http-types", "hyper", @@ -10725,9 +10971,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yaml-rust" @@ -10746,54 +10992,53 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.6.1" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" +checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.3.2" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" +checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", + "zstd-safe 6.0.6", ] [[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 6.0.3+zstd.1.5.2", + "zstd-safe 7.0.0", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", @@ -10801,21 +11046,19 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.3+zstd.1.5.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e4a3f57d13d0ab7e478665c60f35e2a613dcd527851c2c7287ce5c787e134a" +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/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 911d7671ee59c..7c4afb16ebca7 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -34,7 +34,7 @@ let pname = "vector"; - version = "0.33.1"; + version = "0.34.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-SjTXzLDxQ8tPSFirGCiUkgJbCHRRRK5Fr0CKgJ189Yc="; + hash = "sha256-E9sbpVFDVKJKYqSiqXeC9AItset/bXvVA9mURazTn/I="; }; cargoLock = { diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 2d266576f3902..6d772a8ba5c38 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.48"; + version = "1.0.51"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-7LAmU5Ay8Zf8wdKAj7am6cGmWtD5L+lUyxeiv1yv/A4="; + hash = "sha256-SeUwd9S2WMGbNqj9NzZZKW1tQWc0cbe+uZmHc1PWKR8="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-QWWz5c+D2UH+CWGJTaTEuAqHVIW4hu1cM7LWKO7K98Q="; + cargoHash = "sha256-G7pIy8KuDEEVVhH0WzY93eDhH2oTT9sP5CqTgfxYB0c="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 670ad866dff87..6274dae69489c 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -3,6 +3,7 @@ , rustPlatform , stdenv , installShellFiles +, perl , pkg-config , libiconv , openssl @@ -15,20 +16,21 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.38.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-rq7M4g+s44j9jh5GzOjOCBr7VK3m/EQej/Qcnp67NhY="; + hash = "sha256-ZKtYXUNuBwQtEHTaPlptiRncFWattkkcAGGzbKalJZE="; }; - cargoHash = "sha256-xK7lLgjVFUISo4stF6MgfgI4mT5qHuph70cyYaLYZ30="; + cargoHash = "sha256-4XRCXQYJaYvnIfEK2b0VuLy/HIFrafLrK9BvZMnCKpY="; nativeBuildInputs = [ mandown installShellFiles + perl pkg-config ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index f416685dea32b..416d2877e2015 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,30 +1,41 @@ -{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }: +{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem, proEdition ? false }: let - version = "2023.7.2"; + version = "2023.10.2.4"; + + product = if proEdition then { + productName = "pro"; + productDesktop = "Burp Suite Professional Edition"; + hash = "sha256-H5/nxVvAoGzRIAOchv9tAYyFgrodh7XugCTn2oUV9Tw="; + } else { + productName = "community"; + productDesktop = "Burp Suite Community Edition"; + hash = "sha256-en+eay+XL09Vk6H011fYvxGluMAndedtqCo4dQZvbBM="; + }; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://portswigger-cdn.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar" + "https://portswigger.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar" ]; - hash = "sha256-mpOG8sx+L+/kwgB3X9ALOvq+Rx1GC3JE2G7yVt1iQYg="; + hash = product.hash; }; - name = "burpsuite-${version}"; + pname = "burpsuite"; description = "An integrated platform for performing security testing of web applications"; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "burpsuite"; - exec = name; - icon = name; - desktopName = "Burp Suite Community Edition"; + exec = pname; + icon = pname; + desktopName = product.productDesktop; comment = description; categories = [ "Development" "Security" "System" ]; }; in buildFHSEnv { - inherit name; + inherit pname version; runScript = "${jdk}/bin/java -jar ${src}"; @@ -54,9 +65,8 @@ buildFHSEnv { ]; extraInstallCommands = '' - mv "$out/bin/${name}" "$out/bin/burpsuite" # name includes the version number mkdir -p "$out/share/pixmaps" - ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64community.png > "$out/share/pixmaps/burpsuite.png" + ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64${product.productName}.png > "$out/share/pixmaps/burpsuite.png" cp -r ${desktopItem}/share/applications $out/share ''; @@ -69,11 +79,10 @@ buildFHSEnv { exploiting security vulnerabilities. ''; homepage = "https://portswigger.net/burp/"; - downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = jdk.meta.platforms; hydraPlatforms = [ ]; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ arcayr bennofs ]; }; } diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix deleted file mode 100644 index 6cce7d247a5e5..0000000000000 --- a/pkgs/tools/networking/clash/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, clash -}: - -buildGoModule rec { - pname = "clash"; - version = "1.18.0"; - - src = fetchFromGitHub { - owner = "Dreamacro"; - repo = pname; - rev = "v${version}"; - hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs="; - }; - - vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y="; - - # Do not build testing suit - excludedPackages = [ "./test" ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" - "-w" - "-X github.com/Dreamacro/clash/constant.Version=${version}" - ]; - - checkFlags = [ - "-skip=TestParseRule" # Flaky tests - ]; - - passthru.tests.version = testers.testVersion { - package = clash; - command = "clash -v"; - }; - - meta = with lib; { - description = "A rule-based tunnel in Go"; - homepage = "https://dreamacro.github.io/clash/"; - changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ contrun Br1ght0ne ]; - mainProgram = "clash"; - }; -} diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index eb9311240f7db..ffc8579869ca0 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.5"; + version = "9.6.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mbDpd2bkNKRhe19f8sLJJnm9DkFWZ12fPqPDGN7pvCc="; + sha256 = "sha256-y2uS6GlqxfBpLE+6cOl+vLI+KSZ1ThFMjnUNEGplnxM="; }; - vendorHash = "sha256-Nw0d/+EQlB0DJRciB2WD0MKZ4HSYY7oSv0ddMPN0CIQ="; + vendorHash = "sha256-JLNbRmiO38M+JQiSJfxFcdFYrEyNBA1KOHnxbjaCusE="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 0677704b7ad51..e368e10715e62 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog"; license = licenses.eupl12; - maintainers = with maintainers; [ bbigras figsoda ]; + maintainers = with maintainers; [ figsoda ]; mainProgram = "dog"; }; } diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 6e9e32f361e19..158b2cb275bc1 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-ReP+s2p0X39LVvl3/QF7fsYkU+OvsQyMhyuH8v4HuVU="; + hash = "sha256-22Nio6yfkL9HWNrI+kk5dGfojTtB/h0sizCWH9w9so8="; }; - cargoHash = "sha256-FTiNxCoEe/iMz68F1CpJHypgrhn4WwwWowuN9I1rl6E="; + cargoHash = "sha256-YfvcCnFXDoZXp/Aug0jVQkilsvSzS+JF90U0QvVFksE="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index a46fc526e6958..6f3f556e25928 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.10.7"; + version = "1.10.8"; outputs = [ "out" "mu4e" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; + hash = "sha256-cDfW0yXA+0fZY5lv4XCHWu+5B0svpMeVMf8ttX/z4Og="; }; patches = [ diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index ebf56f3cc29d4..9f928224ca7eb 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -53,7 +53,7 @@ }: let - pythonForDocs = python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 ]); + pythonForDocs = python3.pythonOnBuildForHost.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "networkmanager"; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 03183879d6cee..d69f591cab08f 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.20.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - hash = "sha256-jbgxhCQWDw1ZUOAeLhOG+b6JYgvpr5TnNDIO/4k+e7k="; + hash = "sha256-7Yf22EpOTEGGqPoNGnHFyn5A4n7aYFXoSE1G6zyzT3M="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix index bd0c8e82c68ea..86ceeb281cea8 100644 --- a/pkgs/tools/networking/opensnitch/ui.nix +++ b/pkgs/tools/networking/opensnitch/ui.nix @@ -1,5 +1,6 @@ { python3Packages , fetchFromGitHub +, qtwayland , wrapQtAppsHook , lib }: @@ -25,6 +26,10 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; + buildInputs = [ + qtwayland + ]; + propagatedBuildInputs = with python3Packages; [ grpcio-tools pyqt5 diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index ed449ecb992f9..a4ba2b4f04aa5 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub +{ lib, stdenv, buildPythonApplication, fetchFromGitHub , aria , libnotify , pulseaudio @@ -64,6 +64,7 @@ buildPythonApplication rec { meta = with lib; { description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; + broken = stdenv.isDarwin; # Upstream’s build scripts check and fail on Darwin. license = licenses.gpl3; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix index e23db9cc4e3eb..ddd07d28f292a 100644 --- a/pkgs/tools/networking/picosnitch/default.nix +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "picosnitch"; - version = "0.14.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b58255a78a0bf652224ee22ca83137d75ea77b7eb1ad2d11159b56b6788f6201"; + sha256 = "5d427eb46de448e4109f68ed435dd38426df8200aea5bb668639aabe1f0b4580"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index 9b8989f30c2ac..cebec2cb2b60c 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Transparent redirector of any TCP connection to proxy"; - homepage = "http://darkk.net.ru/redsocks/"; + homepage = "https://darkk.net.ru/redsocks/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.ekleog ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 6584edca5e689..7cfb31ff9858b 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ripmime"; version = "1.4.0.10"; src = fetchurl { - url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz"; + url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; - homepage = "http://www.pldaniels.com/ripmime/"; + homepage = "https://pldaniels.com/ripmime/"; platforms = platforms.all; }; passthru = { updateInfo = { - downloadPage = "http://www.pldaniels.com/ripmime/"; + downloadPage = "https://pldaniels.com/ripmime/"; }; }; } diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index bdf303037e385..93f1e64171689 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.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-VqZFQB0TaRd4iYSCfZaRVoxUTuPNX5T7eZ/KppM8+QQ="; + hash = "sha256-qwXBuU/hajWvR+VqMnOUGLDuTuLjbazSPjQ5jvVImJM="; }; - vendorHash = "sha256-8nm1yXlWNXl+/USpnpu2Ndgvn9l/5oR2dNtD8ykfZzM="; + vendorHash = "sha256-2pGnpsgm4mvApvO1sMnRPTRS1unvpVPH9PGlr/S0KbY="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index b630c62c3a9bc..128ef836d5ff4 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }: stdenv.mkDerivation rec { - version = "3.0.36"; + version = "3.0.50"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-nJsjGTtTM9ZjsqZCKKZFrLPZ4jIp1F0Spi6RzeuCzak="; + sha256 = "sha256-UbUXzNpLXMZdcZO/xLdC425LOV2jsZdqcqHTNShwNMY="; }; dontUnpack = true; @@ -24,11 +24,17 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/${jarfilename}" ''; + passthru.tests.version = testers.testVersion { + package = swagger-codegen3; + command = "swagger-codegen3 version"; + }; + meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers._1000101 ]; + mainProgram = "swagger-codegen3"; }; } diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index 3b51398732092..50b70e3f574b3 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -2,15 +2,22 @@ stdenv.mkDerivation rec { pname = "trurl"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-KHJMxzHqHW8WbeD6jxyuzZhuHc5x4B7fP/rYAK687ac="; + hash = "sha256-R/7Saea84iqUICAAQz9zcfDLDud4uFedY2752xyg+oE="; }; + # The version number was forgotten to be updated for the release, + # so do it manually in the meantime. + # See https://github.com/curl/trurl/discussions/244#discussioncomment-7436369 + postPatch = '' + substituteInPlace version.h --replace 0.8 0.9 + ''; + outputs = [ "out" "dev" "man" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index cb0a0243889ef..fbd257e1d69b5 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -52,14 +52,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "getrandom", "once_cell", "version_check 0.9.4", + "zerocopy", ] [[package]] @@ -294,15 +295,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -314,10 +315,10 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -327,18 +328,38 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.25", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.0.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.21", "slab", - "socket2 0.4.9", + "tracing", "waker-fn", + "windows-sys 0.48.0", ] [[package]] @@ -351,35 +372,46 @@ dependencies = [ ] [[package]] +name = "async-lock" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +dependencies = [ + "event-listener 3.0.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] name = "async-process" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener 3.0.0", - "futures-lite", - "rustix 0.38.19", + "event-listener 3.0.1", + "futures-lite 1.13.0", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", - "async-lock", + "async-io 2.2.0", + "async-lock 2.8.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.19", + "rustix 0.38.21", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -394,14 +426,14 @@ dependencies = [ "async-attributes", "async-channel", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -415,16 +447,16 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63547755965f54b682ed0fcb3fa467905fe071ef8feff2d59f24c7afc59661bc" +checksum = "0928198152da571a19145031360f34fc7569ef2dc387681565f330c811a5ba9b" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", - "socket2 0.5.4", + "socket2 0.5.5", "trust-dns-resolver", ] @@ -447,26 +479,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[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-tls" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" +source = "git+https://github.com/async-rs/async-tls?rev=c58588a#c58588a276e6180f3ef99f4ec3bf9176c5f0f58c" dependencies = [ "futures-core", "futures-io", "rustls", "rustls-pemfile", - "webpki", "webpki-roots 0.22.6", ] @@ -478,7 +508,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -632,9 +662,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -673,9 +703,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 = "blake2" @@ -707,7 +737,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -757,11 +787,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "piper", "tracing", ] @@ -801,9 +831,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "capnp" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eddbd729bd9742aa22d29e871a42ffea7f216a4ddbfdaf09ea88150ef2e7f76" +checksum = "499cea1db22c19b7a823fa4876330700077b388cc7de2c5477028df00bcb4ae4" dependencies = [ "embedded-io", ] @@ -939,9 +969,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -949,9 +979,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -962,21 +992,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -1162,9 +1192,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1244,6 +1274,16 @@ dependencies = [ ] [[package]] +name = "ctor" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +dependencies = [ + "quote", + "syn 2.0.39", +] + +[[package]] name = "ctrlc" version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1258,7 +1298,7 @@ name = "cursive" version = "0.20.0" source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-std", "cfg-if 1.0.0", "crossbeam-channel", @@ -1315,7 +1355,7 @@ name = "cursive_core" version = "0.3.7" source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "ansi-parser", "async-std", "crossbeam-channel", @@ -1364,13 +1404,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1426,7 +1466,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1448,7 +1488,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1458,10 +1498,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -1549,15 +1589,15 @@ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", "signature", @@ -1599,14 +1639,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "enum-map" -version = "2.6.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" +checksum = "53337c2dbf26a3c31eccc73a37b10c1614e8d4ae99b6a50d553e8936423c1f16" dependencies = [ "enum-map-derive", ] @@ -1619,7 +1659,7 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1662,7 +1702,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1722,9 +1762,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" dependencies = [ "concurrent-queue", "parking", @@ -1732,6 +1772,16 @@ dependencies = [ ] [[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "pin-project-lite", +] + +[[package]] name = "eyre" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1770,9 +1820,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1789,9 +1839,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" [[package]] name = "flate2" @@ -1830,7 +1880,7 @@ dependencies = [ "futures-core", "futures-sink", "nanorand", - "spin 0.9.8", + "spin", ] [[package]] @@ -1875,15 +1925,15 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.19", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1896,9 +1946,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1906,15 +1956,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1923,9 +1973,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1943,27 +1993,37 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -1977,9 +2037,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2171,16 +2231,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[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", + "ahash 0.8.6", "allocator-api2", ] @@ -2190,7 +2250,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]] @@ -2342,7 +2402,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2363,16 +2423,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -2449,12 +2509,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -2492,7 +2552,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -2500,9 +2560,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -2558,9 +2618,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2646,7 +2706,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d93d243dfa1643389f8b981ddc07b2a7c533f0fae38b3f5831b004b2cc7f6353" dependencies = [ - "async-lock", + "async-lock 2.8.0", "flume", "futures", "js-sys", @@ -2682,9 +2742,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libc-print" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17f111e2175c779daaf5e89fe3a3b0776b0adec218bc1159c56e4d3f58032f5" +dependencies = [ + "libc", +] [[package]] name = "libloading" @@ -2697,6 +2766,17 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libsqlite3-sys" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2739,9 +2819,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", @@ -2846,9 +2926,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -2872,7 +2952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" dependencies = [ "libc", - "socket2 0.4.9", + "socket2 0.4.10", ] [[package]] @@ -3001,7 +3081,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ - "async-io", + "async-io 1.13.0", "bytes", "futures", "libc", @@ -3051,7 +3131,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", ] @@ -3429,9 +3509,9 @@ dependencies = [ [[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" @@ -3451,7 +3531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -3470,13 +3550,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -3518,9 +3598,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", "thiserror", @@ -3529,9 +3609,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -3539,22 +3619,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", @@ -3588,7 +3668,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3632,9 +3712,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "png" @@ -3666,6 +3746,20 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] name = "poly1305" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3759,7 +3853,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3851,33 +3945,33 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.2", + "regex-automata 0.4.3", "regex-syntax 0.8.2", ] @@ -3892,9 +3986,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -3925,30 +4019,15 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.48.0", ] @@ -4009,7 +4088,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4050,9 +4129,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -4064,11 +4143,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys 0.4.10", @@ -4077,14 +4156,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", - "ring 0.16.20", + "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4093,7 +4172,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -4155,12 +4244,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -4229,9 +4318,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9" dependencies = [ "serde_derive", ] @@ -4258,9 +4347,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" +checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" dependencies = [ "js-sys", "serde", @@ -4288,13 +4377,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4316,14 +4405,14 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4332,31 +4421,31 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -4385,7 +4474,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4460,8 +4549,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4aa94397e2023af5b7cff5b8d4785e935cfb77f0e4aab0cae3b26258ace556" dependencies = [ - "async-io", - "futures-lite", + "async-io 1.13.0", + "futures-lite 1.13.0", "libc", "signal-hook", ] @@ -4539,9 +4628,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -4549,9 +4638,9 @@ 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 0.48.0", @@ -4559,12 +4648,6 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -4643,9 +4726,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4687,7 +4770,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.19", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -4702,22 +4785,22 @@ 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", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4801,7 +4884,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -4825,7 +4908,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4841,9 +4924,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4877,9 +4960,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -4890,7 +4973,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -4905,7 +4988,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "futures-core", "futures-util", @@ -4934,7 +5017,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "h2", "http", @@ -4986,9 +5069,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", @@ -5015,7 +5098,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5051,12 +5134,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5133,9 +5216,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -5158,9 +5241,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -5206,7 +5289,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5297,12 +5380,6 @@ checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" @@ -5344,9 +5421,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" @@ -5368,14 +5445,14 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.4" +version = "0.2.5" dependencies = [ "arboard", "async-std", "async-tungstenite", "cfg-if 1.0.0", "chrono", - "clap 4.4.6", + "clap 4.4.7", "config", "crossbeam-channel", "cursive", @@ -5405,11 +5482,11 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.4" +version = "0.2.5" dependencies = [ "argon2", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-std", "async-std-resolver", "async-tls", @@ -5465,13 +5542,13 @@ dependencies = [ "send_wrapper 0.6.0", "serde", "serde-big-array", - "serde-wasm-bindgen 0.6.0", + "serde-wasm-bindgen 0.6.1", "serde_bytes", "serde_json", "serial_test", "shell-words", "simplelog", - "socket2 0.5.4", + "socket2 0.5.5", "static_assertions", "stop-token", "thiserror", @@ -5499,7 +5576,7 @@ dependencies = [ "webpki-roots 0.25.2", "wee_alloc", "winapi", - "windows 0.51.1", + "windows", "windows-permissions", "ws_stream_wasm", "x25519-dalek", @@ -5507,21 +5584,25 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.4" +version = "0.2.5" dependencies = [ "allo-isolate", + "android_log-sys 0.3.1", "async-std", "backtrace", "cfg-if 1.0.0", + "ctor", "data-encoding", "ffi-support", "futures-util", "hostname", "jni", "lazy_static", + "libc-print", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", + "oslog", "paranoid-android", "parking_lot 0.12.1", "serde", @@ -5541,7 +5622,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a3dabbda02cfe176635dcaa18a021416ff2eb4d0b47a913e3fdc7f62049d7b1" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.2", "serde", ] @@ -5560,14 +5641,14 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.2.4" +version = "0.2.5" dependencies = [ "ansi_term", "async-std", "async-tungstenite", "backtrace", "cfg-if 1.0.0", - "clap 4.4.6", + "clap 4.4.7", "color-eyre", "config", "console-subscriber", @@ -5610,10 +5691,10 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.4" +version = "0.2.5" dependencies = [ "android_logger 0.13.3", - "async-lock", + "async-lock 2.8.0", "async-std", "async_executors", "backtrace", @@ -5667,7 +5748,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.4" +version = "0.2.5" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -5679,7 +5760,7 @@ dependencies = [ "parking_lot 0.12.1", "send_wrapper 0.6.0", "serde", - "serde-wasm-bindgen 0.6.0", + "serde-wasm-bindgen 0.6.1", "serde_bytes", "serde_json", "tracing", @@ -5738,9 +5819,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "serde", @@ -5750,24 +5831,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -5777,9 +5858,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5787,28 +5868,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-test" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" dependencies = [ "console_error_panic_hook", "js-sys", @@ -5820,12 +5901,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" dependencies = [ "proc-macro2", "quote", + "syn 2.0.39", ] [[package]] @@ -5847,9 +5929,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -5861,8 +5943,8 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.3", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -5918,7 +6000,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.19", + "rustix 0.38.21", ] [[package]] @@ -5969,15 +6051,6 @@ 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.5", -] - -[[package]] -name = "windows" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" @@ -6150,9 +6223,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -6256,7 +6329,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49" dependencies = [ - "async-io", + "async-io 1.13.0", "byteorder", "derivative", "enumflags2", @@ -6265,7 +6338,7 @@ dependencies = [ "nb-connect", "nix 0.22.3", "once_cell", - "polling", + "polling 2.8.0", "scoped-tls", "serde", "serde_repr", @@ -6286,6 +6359,26 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6302,7 +6395,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index 76880eadc4549..a787bb64517f5 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DQ/rFxUByPlZOHOLBO9OenT2WPiaBKl45ANiH+YkQ08="; + sha256 = "sha256-jcSoZhAAoiKn3Jsov4Q0vunPRC+JwX8O0vYZDT5uO0I="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "async-tls-0.12.0" = "sha256-SAirarvQKsYLftr3u29czQFBwVZgl2cSCUqC0/Qgye0="; "cursive-0.20.0" = "sha256-jETyRRnzt7OMkTo4LRfeRr37oPJpn9R2soxkH7tzGy8="; "cursive-flexi-logger-view-0.5.0" = "sha256-zFpfVFNZNNdNMdpJbaT4O2pMYccGEAGnvYzpRziMwfQ="; "cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8="; diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index 4607dead4441a..b051d5aebed6d 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.6"; + version = "0.10.7"; src = fetchCrate { inherit pname version; - hash = "sha256-pxzWhaxihGQ6n6KyliiPK3YyVdUMP8OlJwT9Msna1OE="; + hash = "sha256-LaUoaZhOA/3o5DyKqq17u3Sf+lvkxMXkkwMEf6YLnCI="; }; - cargoHash = "sha256-pfZDnPWDjOaGov8jEdeyQdP9NWWES+9pSM5yGD31YB4="; + cargoHash = "sha256-Aef0A+4de3vWlK2zOmUmcGGO6XD1DNYwcZ1ryIvo7mM="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/tools/networking/whois/clang.patch b/pkgs/tools/networking/whois/clang.patch deleted file mode 100644 index 3091b9a3eee34..0000000000000 --- a/pkgs/tools/networking/whois/clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/utils.h -+++ b/utils.h -@@ -15,7 +15,7 @@ - #endif - - /* Portability macros */ --#ifdef __GNUC__ -+#if defined __GNUC__ && ! defined __clang__ - # define NORETURN __attribute__((noreturn)) - # define MALLOC_FREE __attribute__((malloc(free))) - # define NONNULL __attribute__((returns_nonnull)) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 465ab76501378..fe4950d5c2407 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,20 +1,16 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.19"; + version = "5.5.20"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; + hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4="; }; - patches = [ - ./clang.patch - ]; - nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 9c58e5e085048..8671cb611dc8e 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -1,54 +1,42 @@ { lib , buildGoModule , fetchFromGitHub -, makeWrapper -, installShellFiles -, docker , distrobox }: buildGoModule rec { pname = "apx"; - version = "1.8.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-nBhSl4r7LlgCA5/HCLpOleihE5n/JCJgf43KdCklQbg="; + rev = "v${version}"; + hash = "sha256-3CelqEntpfld0n+Ewg7NCkowVjgCf5b6StfSkYbgV5k="; }; vendorHash = null; ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ - makeWrapper - installShellFiles - ]; + postPatch = '' + substituteInPlace config/apx.json \ + --replace "/usr/share/apx/distrobox" "${distrobox}/bin/distrobox" \ + --replace "/usr/share/apx" "$out/bin/apx" + substituteInPlace settings/config.go \ + --replace "/usr/share/apx/" "$out/share/apx/" + ''; postInstall = '' - mkdir -p $out/etc/apx - - cat > "$out/etc/apx/config.json" <<EOF - { - "containername": "apx_managed", - "image": "docker.io/library/ubuntu", - "pkgmanager": "apt", - "distroboxpath": "${distrobox}/bin/distrobox" - } - EOF - - wrapProgram $out/bin/apx --prefix PATH : ${lib.makeBinPath [ docker distrobox ]} - - installManPage man/de/man1/apx.1 man/es/man1/apx.1 man/fr/man1/apx.1 man/it/man1/apx.1 man/man1/apx.1 man/nl/man1/apx.1 man/pl/man1/apx.1 man/pt/man1/apx.1 man/pt_BR/man1/apx.1 man/ro/man1/apx.1 man/ru/man1/apx.1 man/sv/man1/apx.1 man/tr/man1/apx.1 + install -D config/apx.json -t $out/share/apx/ + install -D man/man1/apx.1 -t $out/man/man1/ ''; meta = with lib; { description = "The Vanilla OS package manager"; homepage = "https://github.com/Vanilla-OS/apx"; - changelog = "https://github.com/Vanilla-OS/apx/releases/tag/${version}"; + changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya jgarcia ]; }; } diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 229c63ab77449..4ecd812ddc2ae 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "2.8.3"; + version = "2.8.5"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "sha256-Ld6u+F25SOyYr+JWXVmn5G8grQ39eN8EY7j77WNycEE="; + sha256 = "sha256-znvqxZWkQndxE6s36c77whUPc1UokrofTApFSIKFOtM="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 7f0160c2081c1..97c9ba29b6a73 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-yIv29mwCBk2H1HjJr2IYm/1eZU379jTNEuTuaoIu4TA="; + hash = "sha256-SXgl4YFWl1A3N2/IkDftvBl6Rwhnymxe8AqqaekGHTc="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rpm-software-management/dnf5"; changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with lib.maintainers; [ malt3 ]; + maintainers = with lib.maintainers; [ malt3 katexochen ]; mainProgram = "dnf5"; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1aab6b3353ea9..0b80cd531d43f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -203,7 +203,7 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_17; + stable = self.nix_2_18; unstable = self.nix_2_18; } // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index dff2375199e97..aabdf17244113 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -2,6 +2,7 @@ , stdenv , python3 , fetchFromGitHub +, fetchpatch , fetchPypi , nix-update-script , runtimeShell @@ -31,15 +32,25 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.10.0"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ziJJWVr59hsJJqCJljLfSbHHESYegFak+uFLU/k9kZM="; + hash = "sha256-0WZTHGWfxJBZM1RlRN0uFs9kjCum2JjIISatakIReoE="; }; + patches = [ + # https://github.com/NixOS/nixpkgs/issues/265883 + # https://github.com/pdm-project/pdm/pull/2379 + (fetchpatch { + name = "fix-template-permission.patch"; + url = "https://github.com/pdm-project/pdm/commit/f0efdcefe589bc58c28ccf6ce2d23cad9a81dccc.patch"; + hash = "sha256-NnHDSz2N63JzSzh2t9a5f/QQWM6Hyd5Cn5JY2zem6Ac="; + }) + ]; + nativeBuildInputs = [ pdm-backend ]; @@ -101,10 +112,11 @@ buildPythonApplication rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - homepage = "https://pdm.fming.dev"; + homepage = "https://pdm-project.org"; changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; description = "A modern Python package manager with PEP 582 support"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; + mainProgram = "pdm"; }; } diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 9a8b4b3ca3640..845d9fa3e6f15 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { - url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; + url = "https://download.qemu.org/qemu-${version}.tar.bz2"; sha256 = "0j3dfxzrzdp1w21k21fjvmakzc6lcha1rsclaicwqvbf63hkk7vy"; }) afl.src @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.qemu.org/"; + homepage = "https://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8ad4ff9c904c5..ea8108fde301c 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -53,6 +53,11 @@ buildGoModule rec { fi ''; + # plugin test is flaky, see https://github.com/FiloSottile/age/issues/517 + checkFlags = [ + "-skip" "TestScript/plugin" + ]; + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index b2c58136d9a81..44f2e09fc1a99 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JdbKFc374U/MjRiLUbVOqb7qeFYpvMevUdis7GDZz3Y="; + hash = "sha256-uX7mf1y30JngRI4UJYzghk2F4DZh9OQAjgkkNRbAgwc="; }; - vendorHash = "sha256-3/R8dhaJnoAsJgD4pqZ7etTXDFZnhW9sbUrnGp4md5o="; + vendorHash = "sha256-co18Q8nfRjJyDfpmJ1YSJ275DJRJHn2AR3jF8WionNY="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix index 750237a4e2ed9..dd35294ba34a8 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/tools/security/bitwarden/cli.nix @@ -8,9 +8,7 @@ , nixosTests }: -let - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; -in buildNpmPackage' rec { +buildNpmPackage rec { pname = "bitwarden-cli"; version = "2023.10.0"; @@ -21,6 +19,8 @@ in buildNpmPackage' rec { hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; }; + nodejs = nodejs_18; + npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; nativeBuildInputs = [ diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index e48f5945ca600..67ed396b53805 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -24,10 +24,8 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; electron = electron_25; -in buildNpmPackage' rec { +in buildNpmPackage rec { pname = "bitwarden"; version = "2023.10.0"; @@ -38,6 +36,8 @@ in buildNpmPackage' rec { hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; }; + nodejs = nodejs_18; + makeCacheWritable = true; npmWorkspace = "apps/desktop"; npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; diff --git a/pkgs/tools/security/chainsaw/Cargo.lock b/pkgs/tools/security/chainsaw/Cargo.lock index 8ddb4bbf29e09..d088da4d305cc 100644 --- a/pkgs/tools/security/chainsaw/Cargo.lock +++ b/pkgs/tools/security/chainsaw/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -39,30 +39,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -78,9 +77,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -88,9 +87,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.73" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f768393e7fabd388fe8409b13faa4d93ab0fef35db1508438dfdb066918bcf38" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -138,9 +137,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -165,32 +164,22 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest", -] - -[[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 = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "regex-automata", @@ -199,27 +188,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +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 = "bytesize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "camino" @@ -254,10 +243,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] @@ -269,7 +259,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chainsaw" -version = "2.7.3" +version = "2.8.0" dependencies = [ "aho-corasick", "anyhow", @@ -279,11 +269,13 @@ dependencies = [ "bytesize", "chrono", "chrono-tz", - "clap 4.3.21", + "clap 4.4.6", "crossterm", "evtx", + "hex", "indicatif", "lazy_static", + "libesedb", "mft", "notatin", "once_cell", @@ -306,18 +298,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -360,37 +351,36 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.21" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -404,9 +394,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -449,16 +439,6 @@ 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-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -517,20 +497,10 @@ dependencies = [ ] [[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 = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -540,18 +510,18 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] name = "dialoguer" @@ -572,17 +542,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[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-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -703,19 +662,6 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -723,9 +669,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" dependencies = [ "errno-dragonfly", "libc", @@ -779,9 +725,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "float-cmp" @@ -793,16 +739,6 @@ dependencies = [ ] [[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" @@ -810,7 +746,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -836,9 +772,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "heck" @@ -857,18 +793,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "humantime" -version = "1.3.0" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "iana-time-zone" @@ -905,19 +838,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -934,9 +867,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "instant" @@ -953,7 +886,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -964,8 +897,8 @@ 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", + "hermit-abi 0.3.3", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -979,12 +912,30 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] name = "js-sys" version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1001,9 +952,29 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libesedb" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40530440586ce2f7a30fc0867a5faf07767c70cb56c7776cc125409bc45432af" +dependencies = [ + "libesedb-sys", + "time", +] + +[[package]] +name = "libesedb-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a5067ea7b882d70851a209bef21f388242d2c2a9dbb45824b502c94033a8f5" +dependencies = [ + "cc", + "walkdir", +] [[package]] name = "linux-raw-sys" @@ -1013,9 +984,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -1050,9 +1021,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[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" @@ -1073,12 +1044,12 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "chrono", - "clap 4.3.21", + "clap 4.4.6", "csv", "dialoguer", "encoding", - "indoc 2.0.3", - "itertools", + "indoc 2.0.4", + "itertools 0.10.5", "log", "lru", "num-derive", @@ -1106,7 +1077,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -1128,8 +1099,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "notatin" -version = "1.0.0" -source = "git+https://github.com/strozfriedberg/notatin?tag=v1.0.0#f07fddb498d5dfc8a61e1988ced0a28a2c8f253c" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394a6bb8a521ac6140cf95b0a3b1c9a35c3ebccde7a0b13b7a3deb7039220024" dependencies = [ "bitflags 2.4.0", "blake3", @@ -1165,9 +1137,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1237,16 +1209,6 @@ dependencies = [ ] [[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 = "num_threads" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1293,7 +1255,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.2", + "windows-targets 0.48.5", ] [[package]] @@ -1351,15 +1313,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -1369,14 +1331,14 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.11.0", "normalize-line-endings", "predicates-core", "regex", @@ -1414,9 +1376,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" dependencies = [ "unicode-ident", ] @@ -1433,12 +1395,6 @@ dependencies = [ ] [[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.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1459,9 +1415,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1498,9 +1454,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1508,14 +1464,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1549,9 +1503,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -1561,9 +1515,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -1572,9 +1526,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -1584,9 +1538,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", @@ -1598,14 +1552,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.8", "windows-sys 0.48.0", ] @@ -1638,38 +1592,38 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1682,7 +1636,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -1733,14 +1687,14 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.25", + "time", ] [[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 = "skeptic" @@ -1759,9 +1713,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "strsim" @@ -1779,16 +1733,10 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1801,9 +1749,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1827,14 +1775,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -1864,7 +1812,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix 0.37.23", + "rustix 0.37.24", "windows-sys 0.48.0", ] @@ -1882,40 +1830,29 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.45" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dedd246497092a89beedfe2c9f176d44c1b672ea6090edc20544ade01fbb7ea0" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.45" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d7b1fadccbbc7e19ea64708629f9d8dccd007c260d66485f20a6d41bc1cf4b3" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.1.45" +version = "0.3.29" 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.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa", @@ -1928,15 +1865,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -1961,7 +1898,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -1974,31 +1911,25 @@ dependencies = [ ] [[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-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 = "unsafe-libyaml" @@ -2039,9 +1970,9 @@ dependencies = [ [[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", @@ -2049,12 +1980,6 @@ dependencies = [ [[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" @@ -2080,7 +2005,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2102,7 +2027,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2131,9 +2056,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", ] @@ -2150,7 +2075,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.2", + "windows-targets 0.48.5", ] [[package]] @@ -2168,7 +2093,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.2", + "windows-targets 0.48.5", ] [[package]] @@ -2188,17 +2113,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.2", - "windows_aarch64_msvc 0.48.2", - "windows_i686_gnu 0.48.2", - "windows_i686_msvc 0.48.2", - "windows_x86_64_gnu 0.48.2", - "windows_x86_64_gnullvm 0.48.2", - "windows_x86_64_msvc 0.48.2", + "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]] @@ -2209,9 +2134,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -2221,9 +2146,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -2233,9 +2158,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -2245,9 +2170,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -2257,9 +2182,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -2269,9 +2194,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -2281,20 +2206,19 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winstructs" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13eb723aae62864dbb48c23bd55a51be9c53a1880c7762805efdd62570c22acf" +checksum = "6dc7406cd936173d9cc3a4fd5dc5b295bc59612439d72038e3d7ac4e5dd42de9" dependencies = [ "bitflags 1.3.2", "byteorder", "chrono", - "env_logger", "log", "num-derive", "num-traits", diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index fc4c3d5236256..17208b71bde6e 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -7,20 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "chainsaw"; - version = "2.7.3"; + version = "2.8.0"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; rev = "refs/tags/v${version}"; - hash = "sha256-plfEVVMbiTXzBhshO3NZVeuHuNeI9+Lcw1G5xeBiTks="; + hash = "sha256-IBMMZ4NKD7BR3l06C7Y7pRL+pB8p6Ssx6RoXlH2XKyg="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "notatin-1.0.0" = "sha256-eeryJhH7kX8QWwVuEq5RzanVT2FBfFJWAzUDFgUKqR8="; - }; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index b365fa62f9537..7c3af075a5524 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.55"; src = fetchurl { - url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${pname}-${version}.tar.gz"; + url = "ftp://ftp.chkrootkit.org/pub/seg/pac/${pname}-${version}.tar.gz"; sha256 = "sha256-qBwChuxEkxP5U3ASAqAOgbIE/Cz0PieFhaEcEqXgJYs="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Locally checks for signs of a rootkit"; - homepage = "http://www.chkrootkit.org/"; + homepage = "https://www.chkrootkit.org/"; license = licenses.bsd2; platforms = with platforms; linux; }; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index df741a4454c19..89d1850c44309 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.5.2"; + version = "9.6.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-p2FxP67zXpYje+ZS0qsuTL98b8B0YvHRiBb7CxUu/f0="; + hash = "sha256-aFQStXwoko2YA77d+H76AScNCNqC56CyJe5cz74SYdg="; }; proxyVendor = true; - vendorHash = "sha256-XbPa1nag6eSaUcl2dxmvng5gbSJH2htsa22LDseECaQ="; + vendorHash = "sha256-fOSFOUrcxw/77vgPziigkSea93xR2k0Tr/cMGtX+3tc="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index c08a8cf1dd171..3e8acc96f29ee 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-VE/rm85KZs3JWMsidIlUGJ9JrtZ4VBI+Go1yujq7z1s="; + hash = "sha256-J/CQonW/ICrNUSQXVZPMR+WACZYJH0eH6bXhdXE27TY="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-mpT4/BS/NofMueBbwhh4v6pNEONEpWM9RDKuYZ+9BtA="; + vendorHash = "sha256-RPwU6W6a9mnfriyz3ASvamZ3jEG6C2ug/MTp1Pahc/Q="; subPackages = [ "cmd/cosign" @@ -52,6 +52,7 @@ buildGoModule rec { rm pkg/cosign/ctlog_test.go # Require network access rm pkg/cosign/tlog_test.go # Require network access rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access + rm cmd/cosign/cli/verify/verify_blob_test.go # Require network access ''; postInstall = '' diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e0c46ca61f069..509501d52cd40 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-11-03"; + version = "2023-11-11"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ent0FQI2ZCmgQA98bZxGjKW12fj/0yicZ/UFUgfT0yw="; + hash = "sha256-oB28qKIvGHh/h726Wsy8C/zt3rFLBHcP5iRZe3U76U0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index d26429b813de6..0ed0af4e0698b 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ # see https://github.com/NixOS/nixpkgs/issues/4968 - ${python3.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out + ${python3.pythonOnBuildForHost.interpreter} setup.py install_data --install-dir=$out --root=$out ''; postInstall = diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 09f14d6799a4b..7ff4c2e12458c 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "epi052"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u2c+s5kCAYOKwl5eb1zY7xdl4pD6eAjiyRj6JFkA07M="; + hash = "sha256-AFh/IeB88NYPsyUqzaN92GoDbAgl+HG87cIy+Ni06Q8="; }; # disable linker overrides on aarch64-linux @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-rPFj53KQkucz1/yAr6U2nk6gTdxcBxyRHVqGeawBYZU="; + cargoHash = "sha256-Fu3qw3qRK3TZlzK1WcmI/GQ5TM1j+gbGoedwp18SolY="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index e24aff905f129..588737006602b 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.20.0"; + version = "1.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-J2kz8PcR6f7u9+pI1jGAYCakSwj0/WKskQLWuYC5+Hs="; + hash = "sha256-wAYjt/sTo62wn1sdW9ATkzL54mhHj3soAn8+vsX4ZYw="; }; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 46ad8ffd952b5..1e9a4f38e0e64 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "wallarm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jiEs5/HWNZ3DmahWVC6j2eJqFyCAibp1rFS+gtK7haI="; + hash = "sha256-Ypcn6rsimID5B+xrdetxQTopg+xvkNILJFGKf2dbO8k="; }; vendorHash = null; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 79cb5f4def816..6d05f3972499a 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.43"; + version = "1.0.44"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-JuhpfgKk+qb5halKpjlSWJGtuNA/QgELJnFqka33nlU="; + hash = "sha256-qjo5vpT+CtNiNBS0enLzQcsyq/dqRrOTHVB1qqOReM8="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 99481a946b57d..4d7b793a84b58 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.40" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.42" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0441b9c8268f6..58929753c597a 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e4a23dc9d09f5b6b1b82768770e8063014a940bb - ref: refs/tags/6.3.40 + revision: adf413fba45b298c4e16f7f1043dc69f99d2fbdb + ref: refs/tags/6.3.42 specs: - metasploit-framework (6.3.40) + metasploit-framework (6.3.42) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -35,7 +35,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.156) + metasploit-payloads (= 2.0.159) metasploit_data_models metasploit_payloads-mettle (= 1.0.26) mqtt @@ -252,7 +252,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.156) + metasploit-payloads (2.0.159) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 433d49e237baa..44b672cd6e4bd 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.40"; + version = "6.3.42"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-vGCAkXLpsUvSXDf1H3pNStEYUZwFBxJnA7kdNJjqYwo="; + sha256 = "sha256-6ddW6VlbWV71BERJISF67UPRcwLQY8Hpw4kf80lCNBE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f5d060dd96549..8ba7f0e698afb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e4a23dc9d09f5b6b1b82768770e8063014a940bb"; - sha256 = "02k3xac387dr0dki41q5ki8iilaa9mx1zx9pbk94pcg9fa8q0q5w"; + rev = "adf413fba45b298c4e16f7f1043dc69f99d2fbdb"; + sha256 = "049l894z67w9qglw2qyh09rx2hzdg8hj2ja40ksmwnavb7lmdmz9"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.40"; + version = "6.3.42"; }; metasploit-model = { groups = ["default"]; @@ -676,10 +676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2lyyz9n89ii16v1pkw69yrywyjx1mv46rg5z4wa95gbp236mmy"; + sha256 = "1d4jg0wqqqnyk5ba8rpxdz1hd980qmdwpi4fankr036rpm4b79m1"; type = "gem"; }; - version = "2.0.156"; + version = "2.0.159"; }; metasploit_data_models = { groups = ["default"]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 1f9084964b296..64dcd4f220bda 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { "--without-zenmap" ]; + postInstall = '' + install -m 444 -D nselib/data/passwords.lst $out/share/wordlists/nmap.lst + ''; + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.bintools.targetPrefix}ar" "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/tools/security/notation/default.nix index 845f3fbc4b8d5..0164452b9bc9b 100644 --- a/pkgs/tools/security/notation/default.nix +++ b/pkgs/tools/security/notation/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "notation"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "notaryproject"; repo = pname; rev = "v${version}"; - hash = "sha256-mj+LCO6Q4kKfYewPl0R9axZB9O4Yy+GkLlUIDe6yhlI="; + hash = "sha256-KcB5l6TRZhciXO04mz5iORR4//cAhrh+o4Kdq7LA4A4="; }; - vendorHash = "sha256-wQTRgOSOq0LeiSwF5eowaW4R2xCx+kEb0WQ+upsxdAA="; + vendorHash = "sha256-r58ZV63KIHKxh5HDeQRfd0OF0s7xpC4sXvsYLhm8AIE="; # This is a Go sub-module and cannot be built directly (e2e tests). excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 766b570a074e1..30aecae733960 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index e2570c2adf4b4..ba7717771c004 100644 --- a/pkgs/tools/security/passage/default.nix +++ b/pkgs/tools/security/passage/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ kaction ]; platforms = platforms.unix; + mainProgram = "passage"; longDescription = '' passage is a fork of password-store (https://www.passwordstore.org) that uses diff --git a/pkgs/tools/security/sherlock/default.nix b/pkgs/tools/security/sherlock/default.nix index 05954db516292..e3d6f658aeaff 100644 --- a/pkgs/tools/security/sherlock/default.nix +++ b/pkgs/tools/security/sherlock/default.nix @@ -1,50 +1,61 @@ -{ stdenv, lib, fetchFromGitHub, python3, makeWrapper }: -let - pyenv = python3.withPackages (pp: with pp; [ - beautifulsoup4 - certifi - colorama - lxml - pandas - pysocks - requests - requests-futures - soupsieve - stem - torrequest - ]); -in -stdenv.mkDerivation rec { +{ lib +, fetchFromGitHub +, makeWrapper +, python3 +}: + +python3.pkgs.buildPythonApplication rec { pname = "sherlock"; - version = "0.14.3"; + version = "unstable-2023-10-06"; + format = "other"; src = fetchFromGitHub { owner = "sherlock-project"; repo = pname; - rev = "ab2f6788340903df797d8c336a97fa6e742daf77"; - hash = "sha256-AbWZa33DNrDM0FdjoFSVMnz4Ph7mUiUe/erhI3w7GQQ"; + rev = "7ec56895a37ada47edd6573249c553379254d14a"; + hash = "sha256-bK5yEdh830vgKcsU3gLH7TybLncnX6eRIiYPUiVWM74="; }; nativeBuildInputs = [ makeWrapper ]; - postPatch = '' - substituteInPlace sherlock/sherlock.py \ - --replace "os.path.dirname(__file__)" "\"$out/share\"" - ''; + propagatedBuildInputs = with python3.pkgs; [ + certifi + colorama + pandas + pysocks + requests + requests-futures + stem + torrequest + ]; installPhase = '' runHook preInstall + mkdir -p $out/bin $out/share - cp ./sherlock/*.py $out/bin/ - cp --recursive ./sherlock/resources/ $out/share - makeWrapper ${pyenv.interpreter} $out/bin/sherlock --add-flags "$out/bin/sherlock.py" + cp -R ./sherlock $out/share + runHook postInstall ''; + postFixup = '' + makeWrapper ${python3.interpreter} $out/bin/sherlock \ + --add-flags $out/share/sherlock/sherlock.py \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + checkInputs = with python3.pkgs; [ + exrex + ]; + checkPhase = '' runHook preCheck - cd $srcRoot/sherlock - ${pyenv.interpreter} -m unittest tests.all.SherlockSiteCoverageTests --verbose + + cd $out/share/sherlock + for tests in all test_multiple_usernames; do + ${python3.interpreter} -m unittest tests.$tests --verbose + done + runHook postCheck ''; @@ -52,6 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://sherlock-project.github.io/"; description = "Hunt down social media accounts by username across social networks"; license = licenses.mit; + mainProgram = "sherlock"; maintainers = with maintainers; [ applePrincess ]; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 24c1212d607c9..e286f7e7aee3c 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , buildPackages , coreutils , pam @@ -15,28 +14,13 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.14p3"; + version = "1.9.15p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I="; + hash = "sha256-GZwM2/p+/P/6nIhoSo4vsgamK3CjFlB+SpHInIc7vMg="; }; - patches = [ - # Extra bugfix not included in 1.9.14p3 to address a bug that impacts the - # NixOS test suite for sudo. - (fetchpatch { - url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch"; - hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE="; - }) - # Fix for the patch above: - # https://bugzilla.sudo.ws/show_bug.cgi?id=1057 - (fetchpatch { - url = "https://github.com/sudo-project/sudo/commit/d148e7d8f9a98726dd4fde6f187c7d614e1258c7.patch"; - hash = "sha256-3I3PnuAHlBs3JOn0Ul900aFxuUkDGV4sM3S5DNtW7bE="; - }) - ]; - prePatch = '' # do not set sticky bit in nix store substituteInPlace src/Makefile.in --replace 04755 0755 diff --git a/pkgs/tools/security/vaultwarden/Cargo.lock b/pkgs/tools/security/vaultwarden/Cargo.lock index cf74b7f886481..7cb84d651e8dc 100644 --- a/pkgs/tools/security/vaultwarden/Cargo.lock +++ b/pkgs/tools/security/vaultwarden/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,10 +18,32 @@ 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.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -42,6 +64,12 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -58,9 +86,9 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -75,15 +103,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -95,14 +123,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -136,9 +164,9 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.26", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] @@ -148,24 +176,41 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", "async-lock", - "autocfg", + "async-signal", "blocking", "cfg-if", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "rustix 0.37.23", - "signal-hook", + "rustix 0.38.20", + "windows-sys", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", "windows-sys", ] @@ -215,24 +260,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[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.28", + "syn 2.0.38", ] [[package]] @@ -242,10 +287,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -255,9 +309,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -276,9 +330,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -300,9 +354,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 = "blake2" @@ -324,24 +378,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand 1.9.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -350,9 +405,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -360,33 +415,40 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +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 = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cached" -version = "0.44.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700" +checksum = "8cead8ece0da6b744b2ad8ef9c58a4cdc7ef2921e60a6ddfb9eaaa86839b5fc5" dependencies = [ + "ahash 0.8.3", "async-trait", "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown 0.13.2", + "hashbrown 0.14.2", "instant", "once_cell", "thiserror", @@ -395,11 +457,10 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082" +checksum = "7da8245dd5f576a41c3b76247b54c15b0e43139ceeb4f732033e15be7c005176" dependencies = [ - "cached_proc_macro_types", "darling", "proc-macro2", "quote", @@ -414,9 +475,9 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -429,15 +490,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -463,10 +524,20 @@ dependencies = [ ] [[package]] +name = "chumsky" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" +dependencies = [ + "hashbrown 0.12.3", + "stacker", +] + +[[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -545,9 +616,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", ] @@ -628,12 +699,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -653,9 +724,12 @@ checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "devise" @@ -683,20 +757,20 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "diesel" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c" +checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "chrono", "diesel_derives", @@ -712,14 +786,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74398b79d81e52e130d991afeed9c86034bb1b7735f46d2f5bf7deb261d80303" +checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -749,7 +823,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -781,7 +855,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "memchr", ] @@ -796,23 +870,23 @@ dependencies = [ [[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 = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -823,26 +897,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "error-chain" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -858,6 +921,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -868,9 +942,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fern" @@ -878,29 +952,31 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" dependencies = [ + "libc", "log", + "reopen", "syslog", ] [[package]] name = "figment" -version = "0.10.10" +version = "0.10.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +checksum = "a014ac935975a70ad13a3bff2463b1c1b083b35ae4cb6309cfc59476aa7a181f" dependencies = [ - "atomic", + "atomic 0.6.0", "pear", "serde", - "toml", + "toml 0.8.2", "uncased", "version_check", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1007,7 +1083,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -1082,9 +1158,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -1124,9 +1200,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1149,9 +1225,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.7" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" +checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" dependencies = [ "log", "pest", @@ -1167,18 +1243,19 @@ 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.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - -[[package]] -name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] [[package]] name = "heck" @@ -1188,9 +1265,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hmac" @@ -1202,6 +1279,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1272,7 +1358,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1294,16 +1380,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1365,12 +1451,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1405,10 +1491,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", "windows-sys", - "winreg 0.50.0", + "winreg", ] [[package]] @@ -1424,7 +1510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.8", + "rustix 0.38.20", "windows-sys", ] @@ -1462,13 +1548,13 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "1e863f95209c79b9b8b001c4b03463385f890a765dbc4e0802cb8d4177e3e410" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "pem", - "ring", + "ring 0.17.5", "serde", "serde_json", "simple_asn1", @@ -1491,44 +1577,46 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lettre" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" +checksum = "d47084ad58f99c26816d174702f60e873f861fcef3f9bd6075b4ad2dd72d07d5" dependencies = [ "async-std", "async-trait", - "base64 0.21.2", + "base64 0.21.4", + "chumsky", "email-encoding", "email_address", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-io", "futures-util", "hostname", "httpdate", - "idna 0.3.0", + "idna 0.4.0", "mime", "native-tls", "nom", "once_cell", "quoted_printable", "serde", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tokio-native-tls", "tracing", + "url", ] [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", @@ -1559,15 +1647,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1638,9 +1726,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[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 = "migrations_internals" @@ -1649,7 +1737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ "serde", - "toml", + "toml 0.7.8", ] [[package]] @@ -1665,9 +1753,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] @@ -1786,9 +1874,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1797,13 +1885,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.28", + "syn 2.0.38", ] [[package]] @@ -1818,9 +1906,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", ] @@ -1846,9 +1934,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1861,11 +1949,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -1882,7 +1970,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -1893,18 +1981,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.27.0+1.1.1v" +version = "111.28.0+1.1.1w" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" +checksum = "3ce95ee1f6f999dfb95b8afd43ebe442758ea2104d1ccb99a94c30db22ae701f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -1921,9 +2009,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1937,13 +2025,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1994,16 +2082,17 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "pem" -version = "1.1.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", + "serde", ] [[package]] @@ -2014,19 +2103,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" dependencies = [ "pest", "pest_generator", @@ -2034,22 +2124,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" dependencies = [ "once_cell", "pest", @@ -2102,9 +2192,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2113,6 +2203,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2135,6 +2236,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2151,9 +2258,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2166,7 +2273,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", "version_check", "yansi 1.0.0-rc.1", ] @@ -2178,6 +2285,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] name = "publicsuffix" version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2211,18 +2327,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "r2d2" @@ -2284,35 +2400,44 @@ 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 = "ref-cast" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -2326,13 +2451,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -2343,18 +2468,29 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reopen" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "ff42cec3acf85845f5b18b3cbb7fec619ccbd4a349f6ecbe1c62ab46d4d98293" +dependencies = [ + "autocfg", + "libc", + "signal-hook", +] [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "async-compression", - "base64 0.21.2", + "base64 0.21.4", "bytes", "cookie 0.16.2", "cookie_store 0.16.2", @@ -2377,6 +2513,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-socks", @@ -2388,7 +2525,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -2411,12 +2548,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + +[[package]] name = "rmp" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2444,7 +2595,7 @@ source = "git+https://github.com/SergioBenitez/Rocket?rev=ce441b5f46fdf5cd99cb32 dependencies = [ "async-stream", "async-trait", - "atomic", + "atomic 0.5.3", "binascii", "bytes", "either", @@ -2486,7 +2637,7 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn 2.0.28", + "syn 2.0.38", "unicode-xid", ] @@ -2557,9 +2708,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" dependencies = [ "bitflags 1.3.2", "errno", @@ -2571,25 +2722,25 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -2600,17 +2751,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2670,8 +2821,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2699,15 +2850,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -2724,20 +2875,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2778,9 +2929,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2789,9 +2940,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2800,9 +2951,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2840,30 +2991,30 @@ dependencies = [ [[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", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "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", @@ -2871,9 +3022,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -2901,6 +3052,19 @@ dependencies = [ ] [[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] name = "state" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2934,9 +3098,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2957,36 +3121,57 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall", - "rustix 0.38.8", + "fastrand 2.0.1", + "redox_syscall 0.3.5", + "rustix 0.38.20", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -3010,14 +3195,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -3025,15 +3211,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3055,9 +3241,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -3067,7 +3253,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] @@ -3080,7 +3266,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", ] [[package]] @@ -3140,9 +3326,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -3154,14 +3340,26 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] @@ -3175,11 +3373,24 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", + "serde", + "serde_spanned", + "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", @@ -3206,11 +3417,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3219,20 +3429,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.28", + "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", @@ -3269,9 +3479,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" dependencies = [ "async-trait", "cfg-if", @@ -3280,9 +3490,9 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.4.0", "ipnet", - "lazy_static", + "once_cell", "rand", "smallvec", "thiserror", @@ -3294,16 +3504,17 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" dependencies = [ "cfg-if", "futures-util", "ipconfig", - "lazy_static", "lru-cache", + "once_cell", "parking_lot", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -3339,15 +3550,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ubyte" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea" dependencies = [ "serde", ] @@ -3376,9 +3587,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3402,10 +3613,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -3421,9 +3638,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[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", ] @@ -3436,9 +3653,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 = "vaultwarden" @@ -3474,13 +3691,14 @@ dependencies = [ "num-traits", "once_cell", "openssl", + "openssl-sys", "paste", "percent-encoding", "pico-args", "rand", "regex", "reqwest", - "ring", + "ring 0.17.5", "rmpv", "rocket", "rocket_ws", @@ -3515,15 +3733,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", @@ -3565,7 +3783,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3599,7 +3817,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3612,9 +3830,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -3654,13 +3872,15 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.20", + "windows-sys", ] [[package]] @@ -3687,9 +3907,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", ] @@ -3710,6 +3930,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3720,9 +3949,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -3735,66 +3964,57 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.10" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index e7d620a1bc209..1239b4fd1c6bb 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, rustPlatform, fetchFromGitHub, nixosTests , pkg-config, openssl -, libiconv, Security, CoreServices +, libiconv, Security, CoreServices, SystemConfiguration , dbBackend ? "sqlite", libmysqlclient, postgresql }: let @@ -9,13 +9,13 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.29.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-ByMPS68GBOvjB/RpoLAvgE+NcbbIa1qfU1TQ4yhbH+I="; + hash = "sha256-mBKedJvb67FR4e8ZzdL8umg9XTgch1OWhbR1k46Lkn4="; }; cargoLock = { @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] + ++ optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; diff --git a/pkgs/tools/security/vaultwarden/update.nix b/pkgs/tools/security/vaultwarden/update.nix index c2c03413cc435..4d0c6c4a50474 100644 --- a/pkgs/tools/security/vaultwarden/update.nix +++ b/pkgs/tools/security/vaultwarden/update.nix @@ -1,4 +1,4 @@ -{ writeShellScript +{ writeShellApplication , lib , nix , nix-prefetch-git @@ -8,20 +8,23 @@ , gnugrep , gnused , jq +, yq }: -writeShellScript "update-vaultwarden" '' - PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix nix-prefetch-git nix-update ]} +lib.getExe (writeShellApplication { + name = "update-vaultwarden"; + runtimeInputs = [ curl git gnugrep gnused jq yq nix nix-prefetch-git nix-update ]; - set -euxo pipefail + text = '' + VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name') + nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION" - VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name') - nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION" - - URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2" - WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/") - old_hash=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) - new_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) - sed -e "s#$old_hash#$new_hash#" -i pkgs/tools/security/vaultwarden/webvault.nix - nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" -'' + URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml" + WEBVAULT_VERSION="$(curl --silent "$URL" | yq -r ".vault_version" | sed s/^v//)" + old_hash="$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash)" + new_hash="$(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")" + new_hash_sri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")" + sed -e "s#$old_hash#$new_hash_sri#" -i pkgs/tools/security/vaultwarden/webvault.nix + nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" + ''; +}) diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 585c1b5c51626..52f153b6a30d3 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -7,13 +7,13 @@ }: let - version = "2023.7.1"; + version = "2023.10.0"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-B7FGLKuwxldlHnIIzQbDjZT9cs5+lixo/fBtlexNLQc="; + hash = "sha256-5vfmMJIGKyZlTQDi/t1YKAALbW/6BFAcWODfkypk/eA="; }; in buildNpmPackage rec { pname = "vaultwarden-webvault"; @@ -23,10 +23,10 @@ in buildNpmPackage rec { owner = "bitwarden"; repo = "clients"; rev = "web-v${lib.removeSuffix "b" version}"; - hash = "sha256-HEEUboaIY/Zi/wUhp9y7oIOuQl6csjo97eygTLPNfNo="; + hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; }; - npmDepsHash = "sha256-8Epkvjzllt//kdrKT4jUDOhj47Fnb0qSFU1qJthL2Mo="; + npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix index cc8b7752e62a7..a913835743aa3 100644 --- a/pkgs/tools/security/yersinia/default.nix +++ b/pkgs/tools/security/yersinia/default.nix @@ -8,32 +8,15 @@ stdenv.mkDerivation rec { pname = "yersinia"; - version = "0.8.2"; + version = "unstable-2022-11-20"; src = fetchFromGitHub { owner = "tomac"; repo = pname; - rev = "v${version}"; - sha256 = "06yfpf9iyi525rly1ychsihzvw3sas8kp0nxxr99xkwiqp5dc78b"; + rev = "867b309eced9e02b63412855440cd4f5f7727431"; + sha256 = "sha256-VShg9Nzd8dzUNiqYnKcDzRgqjwar/8XRGEJCJL25aR0="; }; - patches = [ - # ncurses-6.3 support, included in next release - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch"; - sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI="; - }) - - # Pull upstream fix for -fno-common toolchain support: - # https://github.com/tomac/yersinia/pull/66 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/tomac/yersinia/commit/36247225dc7a6f38c4ba70537e20351f04762749.patch"; - sha256 = "KHaN8gfgNROEico27gWnYiP9ZVhpWz0KjFYy2t5tPBo="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libpcap libnet ncurses ] ++ lib.optional withGtk gtk2; @@ -58,7 +41,5 @@ stdenv.mkDerivation rec { # so not sure, but it could work on openbsd, illumos, and freebsd # if you have a machine to test with, feel free to add these platforms = with platforms; linux; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index e1d4102430f99..a6364ffb6b11f 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-LqgA990os33Hftu8+h/HKnOcGcKsAXVuQl1hmCmA5n4="; + hash = "sha256-/Tf4himhvX7RP+zCd4Dhgcrdo+19Unm2ypaZxGiAfrc="; }; - vendorHash = "sha256-zY6c9Wnq00cAuw0WIK3XsTZ1/YL8lnzSEnusUY5VsxY="; + vendorHash = "sha256-I/prgTUk5FviC9STb7+Yq0VJ1BzlKpnK+Ko21ut1sP4="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix index f54e76777612a..266879a303338 100644 --- a/pkgs/tools/system/minijail/tools.nix +++ b/pkgs/tools/system/minijail/tools.nix @@ -21,7 +21,7 @@ buildPythonApplication { make libconstants.gen.c libsyscalls.gen.c ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \ libconstants.gen.c libsyscalls.gen.c - ${python.pythonForBuild.interpreter} tools/generate_constants_json.py \ + ${python.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \ --output constants.json \ libconstants.gen.ll libsyscalls.gen.ll ''; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 3c48c53bf90c5..e6f65a8c0f5e1 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -13,12 +13,13 @@ , withConnPubSub ? false, google-cloud-cpp, grpc , withConnPrometheus ? false, snappy , withSsl ? true, openssl +, withSystemdJournal ? (!stdenv.isDarwin), systemd , withDebug ? false }: stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.43.0"; + version = "1.43.2"; pname = "netdata"; src = fetchFromGitHub { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-hrwuJLO9/K5QT3j8d5RYHcpBHChpKvwajaCoUfikw88=" - else "sha256-+bX6pVpW6N1ms04k63sJg0E9XMOai5K9IjEQPeVCzs8="; + then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74=" + else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] ++ lib.optionals withConnPrometheus [ snappy ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] + ++ lib.optionals withSystemdJournal [ systemd ] ++ lib.optionals withSsl [ openssl ]; patches = [ @@ -93,6 +95,10 @@ stdenv.mkDerivation rec { $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ $out/libexec/netdata/plugins.d/slabinfo.plugin.org + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} ${lib.optionalString withIpmi '' mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org @@ -109,6 +115,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-ebpf" "--with-jemalloc=${jemalloc}" + ] ++ lib.optionals (withSystemdJournal) [ + "--enable-plugin-systemd-journal" ] ++ lib.optionals (!withDBengine) [ "--disable-dbengine" ] ++ lib.optionals (!withCloud) [ diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 2114374bc61b9..6e64d33f7fb9e 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGo121Module rec { pname = "netdata-go-plugins"; - version = "0.56.3"; + version = "0.56.4"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-T7UB7qrcMTqIFRzBxbXmSqtcEFgZd0/z4EYuH/ydVi4="; + hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw="; }; - vendorHash = "sha256-N0p03urHC3d17VQ4TIs7mAemW9ZSpQw20EwwD6lSLLc="; + vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0="; doCheck = false; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index af29e316c278d..b6ce8fc8d8a4f 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.00"; + version = "0.17.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-VChEuxNDQfkJyherlInbFEBGf6djp5zRQYaZB7w7A3s="; + hash = "sha256-hTwA0BT8r54Gnyf/itP2onQE6zhNEoejseuIEwvx4D8="; }; postPatch = '' diff --git a/pkgs/tools/system/supercronic/default.nix b/pkgs/tools/system/supercronic/default.nix new file mode 100644 index 0000000000000..3b3f285a08656 --- /dev/null +++ b/pkgs/tools/system/supercronic/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, python3 +, bash +, coreutils +}: + +buildGoModule rec { + pname = "supercronic"; + version = "0.2.27"; + + src = fetchFromGitHub { + owner = "aptible"; + repo = pname; + rev = "v${version}"; + hash = "sha256-sgKvE8Ze2qKPgdaAwN1sB0wX7k5VRx8+llkT54xXvrM="; + }; + + vendorHash = "sha256-j1iduvu+dKmhvPN8pe50fGQU5cC9N3gfoMh9gSQDbf8="; + + excludedPackages = [ "cronexpr/cronexpr" ]; + + nativeCheckInputs = [ python3 bash coreutils ]; + + postConfigure = '' + # There are tests that set the shell to various paths + substituteInPlace cron/cron_test.go --replace /bin/sh ${bash}/bin/sh + substituteInPlace cron/cron_test.go --replace /bin/false ${coreutils}/bin/false + ''; + + meta = with lib; { + description = "Cron tool designed for use in containers"; + homepage = "https://github.com/aptible/supercronic"; + license = licenses.mit; + maintainers = with maintainers; [ nasageek ]; + }; +} diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 4318ba492aeec..52ad79fab689a 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 022ed0b0f0b6b..4925ce3971900 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.12"; + version = "1.10.2"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-N4gw2SaNAcQULNxE+v4I+UhfziLH7zLs0cIP5mHGUx0="; + hash = "sha256-sfw+Si6g6NVUWZdB6q3wnoabMAqIR9/KT1HsXtbafDY="; }; - vendorHash = "sha256-3VNcis7G0k/WTt8APvFaVBoYTo+RhjpnT1cGWhQhXK0="; + vendorHash = "sha256-3g47EuDElz1lrw7pgzD1jtTAs2Up97WWWFHe6aFE9zk="; subPackages = [ "cmd/gtree" diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix index b5d12e7b3dcf6..8882ca5ea192b 100644 --- a/pkgs/tools/text/mdhtml/default.nix +++ b/pkgs/tools/text/mdhtml/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "mdhtml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Tomkoid"; repo = pname; rev = version; - hash = "sha256-893pqrrTftzKqPYZgukV/yx2gkukVZWDTgg7ufx1MsY="; + hash = "sha256-Pzl6Hmc24uWQ02FQM84rsypTJy1GdvYqfLDjN6Ryq4Q="; }; vendorHash = null; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 009150062db20..8dc160cd014dd 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,28 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, Security }: rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; + hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA="; }; - cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + cargoHash = "sha256-IhCuWCaSU7c7Tot4uvxE7oabY69wDLstuBN35OzkQcU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - preFixup = '' - installManPage $releaseDir/build/sd-*/out/sd.1 + postInstall = '' + installManPage gen/sd.1 - installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} - installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + installShellCompletion gen/completions/sd.{bash,fish} + installShellCompletion --zsh gen/completions/_sd ''; meta = with lib; { diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 5d605571b83aa..2ccee0bae005e 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -50,5 +50,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.com/latex-rubber/rubber"; maintainers = with maintainers; [ ttuegel peterhoeg ]; platforms = platforms.unix; + mainProgram = "rubber"; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 99eb67aa6ff2a..41231ae1b186a 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -40,9 +40,10 @@ lib.fix (self: { let ### texlive.combine backward compatibility # if necessary, convert old style { pkgs = [ ... ]; } packages to attribute sets - ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps - then let oldStyle = builtins.partition (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps; - in oldStyle.wrong ++ lib.concatMap toTLPkgSets oldStyle.right + isOldPkgList = p: ! p.outputSpecified or false && p ? pkgs && builtins.all (p: p ? tlType) p.pkgs; + ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any isOldPkgList ps + then let oldPkgLists = builtins.partition isOldPkgList ps; + in oldPkgLists.wrong ++ lib.concatMap toTLPkgSets oldPkgLists.right else ps; pkgList = rec { diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index f3dce87755329..c360d191064d5 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/recyclarr/recyclarr/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ josephst ]; + mainProgram = "recyclarr"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a7bc5b7c4d9b..43fb25304dac5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -89,6 +89,7 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 + binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 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 @@ -145,6 +146,7 @@ mapAliases ({ composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 + clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 @@ -714,6 +716,7 @@ mapAliases ({ pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 + prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b316c559463f..e120ee67b902d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -356,7 +356,10 @@ with pkgs; binbloom = callPackage ../tools/security/binbloom { }; - bingo = callPackage ../development/tools/bingo { }; + bingo = callPackage ../development/tools/bingo { + # See https://github.com/bwplotka/bingo/issues/143. + buildGoModule = buildGo120Module; + }; bin2c = callPackage ../development/tools/bin2c { }; @@ -2052,6 +2055,8 @@ with pkgs; steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch { }; + supercronic = callPackage ../tools/system/supercronic { }; + supermin = callPackage ../tools/virtualization/supermin { }; sx-go = callPackage ../tools/security/sx-go { }; @@ -2506,6 +2511,8 @@ with pkgs; gst = callPackage ../applications/version-management/gst { }; + guilt = callPackage ../applications/version-management/guilt { }; + gut = callPackage ../applications/version-management/gut { }; hred = callPackage ../development/tools/hred { }; @@ -2992,8 +2999,6 @@ with pkgs; walk = callPackage ../applications/file-managers/walk { }; - worker = callPackage ../applications/file-managers/worker { }; - xfe = callPackage ../applications/file-managers/xfe { fox = fox_1_6; }; @@ -3541,10 +3546,6 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; - binance = callPackage ../applications/misc/binance { - electron = electron_13; - }; - biscuit-cli = callPackage ../tools/security/biscuit-cli { }; bitwarden = callPackage ../tools/security/bitwarden { }; @@ -4469,7 +4470,10 @@ with pkgs; brltty = callPackage ../tools/misc/brltty { }; - brook = callPackage ../tools/networking/brook { }; + brook = callPackage ../tools/networking/brook { + # See https://hydra.nixos.org/build/239027853/nixlog/2. + buildGoModule = buildGo120Module; + }; broot = callPackage ../tools/misc/broot { inherit (darwin.apple_sdk.frameworks) Security; @@ -4664,8 +4668,6 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash = callPackage ../tools/networking/clash { }; - clash-geoip = callPackage ../data/misc/clash-geoip { }; clash-meta = callPackage ../tools/networking/clash-meta { }; @@ -4884,7 +4886,7 @@ with pkgs; clipster = callPackage ../tools/misc/clipster { }; clockify = callPackage ../applications/office/clockify { - electron = electron_11; + electron = electron_24; }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -6027,8 +6029,8 @@ with pkgs; moar = callPackage ../tools/misc/moar { }; mobilizon = callPackage ../servers/mobilizon { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + elixir = elixir_1_15; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; }); mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { }; }; @@ -9915,7 +9917,14 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15.overrideScope (self: super: { + zarith = super.zarith.overrideAttrs (o: { + src = fetchzip { + url = "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.12.tar.gz"; + hash = "sha256-SQegsMc1+UIod8XeJDE+H5q1huNDQI8CUh7IsHOoVMs="; + }; + }); + }); in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -15851,10 +15860,8 @@ with pkgs; default-gcc-version = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 else 12; - inherit ({ - gcc = pkgs.${"gcc${toString default-gcc-version}"}; - gccFun = callPackage ../development/compilers/gcc; - }) gcc gccFun; + gcc = pkgs.${"gcc${toString default-gcc-version}"}; + gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; wrapNonDeterministicGcc = stdenv: ccWrapper: @@ -15979,41 +15986,7 @@ with pkgs; extraPackages = []; }; - # This expression will be pushed into pkgs/development/compilers/gcc/common - # once the top-level gcc/${version}/default.nix files are deduplicated. - inherit - (lib.listToAttrs (map (majorMinorVersion: - let atLeast = lib.versionAtLeast majorMinorVersion; - attrName = "gcc${lib.replaceStrings ["."] [""] majorMinorVersion}"; - pkg = lowPrio (wrapCC (callPackage ../development/compilers/gcc/default.nix ({ - inherit noSysDirs; - inherit majorMinorVersion; - reproducibleBuild = true; - profiledCompiler = false; - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { }; - isl = if stdenv.isDarwin then null - else if atLeast "9" then isl_0_20 - else if atLeast "7" then isl_0_17 - else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) - else if atLeast "4.9" then isl_0_11 - else /* "4.8" */ isl_0_14; - } // lib.optionalAttrs (majorMinorVersion == "4.8") { - texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump - } // lib.optionalAttrs (majorMinorVersion == "4.9") { - # Build fails on Darwin with clang - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; - } // lib.optionalAttrs (!(atLeast "6")) { - cloog = if stdenv.isDarwin - then null - else if atLeast "4.9" then cloog_0_18_0 - else /* 4.8 */ cloog; - } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { - # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; - }))); - in lib.nameValuePair attrName pkg - ) [ "4.8" "4.9" "6" "7" "8" "9" "10" "11" "12" "13" ])) + inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13; gcc_latest = gcc13; @@ -16274,7 +16247,7 @@ with pkgs; gforth = callPackage ../development/compilers/gforth { }; gleam = callPackage ../development/compilers/gleam { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; gmqcc = callPackage ../development/compilers/gmqcc { }; @@ -17290,10 +17263,6 @@ with pkgs; scryer-prolog = callPackage ../development/compilers/scryer-prolog { }; - sdcc = callPackage ../development/compilers/sdcc { - gputils = null; - }; - seren = callPackage ../applications/networking/instant-messengers/seren { }; serialdv = callPackage ../development/libraries/serialdv { }; @@ -19691,8 +19660,6 @@ with pkgs; ''; }; - mommy = callPackage ../tools/misc/mommy { }; - moon = callPackage ../development/tools/build-managers/moon/default.nix { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -22896,7 +22863,9 @@ with pkgs; libfabric = callPackage ../development/libraries/libfabric { }; - libfive = qt6Packages.callPackage ../development/libraries/libfive { }; + libfive = qt6Packages.callPackage ../development/libraries/libfive { + python = python3; + }; libfixposix = callPackage ../development/libraries/libfixposix { }; @@ -24667,7 +24636,7 @@ with pkgs; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs qt5; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope; }); # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop @@ -25027,6 +24996,7 @@ with pkgs; sdnotify-wrapper skalibs skalibs_2_10 + tipidee utmps; kgt = callPackage ../development/tools/kgt { @@ -25254,6 +25224,8 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + subxt = callPackage ../development/tools/subxt { }; + suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { }; sundials = callPackage ../development/libraries/sundials { @@ -26494,6 +26466,14 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; + buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; + home-assistant-custom-components = lib.recurseIntoAttrs + (callPackage ../servers/home-assistant/custom-components { + inherit (home-assistant.python.pkgs) callPackage; + }); + home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs + (callPackage ../servers/home-assistant/custom-lovelace-modules {}); + home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; @@ -26604,9 +26584,7 @@ with pkgs; mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; - mailmanPackages = callPackage ../servers/mail/mailman { - python3 = python310; - }; + mailmanPackages = callPackage ../servers/mail/mailman { }; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; @@ -28603,8 +28581,6 @@ with pkgs; pps-tools = callPackage ../os-specific/linux/pps-tools { }; - prayer = callPackage ../servers/prayer { }; - procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -30010,6 +29986,10 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { + inherit (gnome) adwaita-icon-theme; + }; + rubik = callPackage ../data/fonts/rubik { }; rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; @@ -30993,6 +30973,8 @@ with pkgs; cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { }; + cosmic-edit = callPackage ../applications/editors/cosmic-edit { }; + coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; @@ -33957,6 +33939,7 @@ with pkgs; mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; + inherit (darwin) sigtool; }; shaka-packager = callPackage ../applications/video/shaka-packager { }; @@ -33969,7 +33952,7 @@ with pkgs; wlroots = wlroots_0_15; }; - mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; + mpvScripts = callPackage ../applications/video/mpv/scripts { }; open-in-mpv = callPackage ../applications/video/open-in-mpv { }; @@ -34061,8 +34044,6 @@ with pkgs; ninjas2 = callPackage ../applications/audio/ninjas2 { }; - nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; - nootka = qt5.callPackage ../applications/audio/nootka { }; novnc = callPackage ../applications/networking/novnc { }; @@ -34176,9 +34157,7 @@ with pkgs; pnglatex = with python3Packages; toPythonApplication pnglatex; - polybar = callPackage ../applications/misc/polybar { }; - - polybarFull = callPackage ../applications/misc/polybar { + polybarFull = polybar.override { alsaSupport = true; githubSupport = true; mpdSupport = true; @@ -34904,7 +34883,9 @@ with pkgs; inherit (darwin) sigtool; }; - qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix { }; + qemu-utils = qemu.override { + toolsOnly = true; + }; canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; @@ -35896,7 +35877,9 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; - tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { }; + tokyo-night-gtk = tokyo-night-gtk-variants.full; + + tokyo-night-gtk-variants = recurseIntoAttrs (callPackage ../data/themes/tokyo-night-gtk { }); topydo = callPackage ../applications/misc/topydo { }; @@ -35932,9 +35915,7 @@ with pkgs; toxiproxy = callPackage ../development/tools/toxiproxy { }; - tqsl = callPackage ../applications/radio/tqsl { - openssl = openssl_1_1; - }; + tqsl = callPackage ../applications/radio/tqsl { }; trustedqsl = tqsl; # Alias added 2019-02-10 transcode = callPackage ../applications/audio/transcode { }; @@ -37354,7 +37335,7 @@ with pkgs; heroic-unwrapped = callPackage ../games/heroic { # Match the version used by the upstream package. - electron = electron_24; + electron = electron_27; }; heroic = callPackage ../games/heroic/fhsenv.nix { }; @@ -41287,7 +41268,7 @@ with pkgs; vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; vaultwarden = callPackage ../tools/security/vaultwarden { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; + inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration; }; vaultwarden-sqlite = vaultwarden; vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5ca5e3867d5c5..7c72f34fdbefd 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -70,6 +70,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + iris-named-props = callPackage ../development/coq-modules/iris-named-props {}; itauto = callPackage ../development/coq-modules/itauto { }; ITree = callPackage ../development/coq-modules/ITree { }; LibHyps = callPackage ../development/coq-modules/LibHyps {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6b129e6aca01a..0b970cb44f042 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -415,22 +415,15 @@ in { }; ghc98 = compiler.ghc981; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc924 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 - else - packages.ghc924Binary; + bootPkgs = packages.ghc963; 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; - # 2023-01-15: Support range >= 10 && < 15 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; - llvmPackages = pkgs.llvmPackages_14; + # 2023-01-15: Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; }; ghcjs = compiler.ghcjs810; @@ -586,7 +579,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; }; ghcjs = packages.ghcjs810; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c839d11748c2e..a997b12325efa 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -565,6 +565,8 @@ in { hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { }; + hid-tmff2 = callPackage ../os-specific/linux/hid-tmff2 { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e0ccb6aa9a084..3810390f7862f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -266,6 +266,8 @@ lib.makeScope pkgs.newScope (self: with self; { meminfo = callPackage ../development/php-packages/meminfo { }; + memprof = callPackage ../development/php-packages/memprof { }; + mongodb = callPackage ../development/php-packages/mongodb { inherit (pkgs) darwin; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ecd5a40c38b79..30a0d6472232a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28 backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28 backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28 + bash_kernel = bash-kernel; # added 2023-11-10 beancount_docverif = beancount-docverif; # added 2023-10-08 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bip_utils = bip-utils; # 2023-10-08 @@ -212,12 +213,16 @@ mapAliases ({ jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 + jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + lazr_config = lazr-config; # added 2023-11-03 + lazr_delegates = lazr-delegates; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 + line_profiler = line-profiler; # added 2023-11-04 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 @@ -238,6 +243,7 @@ mapAliases ({ mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 + multi_key_dict = multi-key-dict; # added 2023-11-05 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 @@ -291,6 +297,8 @@ mapAliases ({ pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 + pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 + pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 @@ -388,6 +396,7 @@ mapAliases ({ selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_scm = setuptools-scm; # added 2021-06-03 + setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 @@ -415,6 +424,7 @@ mapAliases ({ Theano = theano; # added 2023-02-19 TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 + torrent_parser = torrent-parser; # added 2023-11-04 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b51096ec9919a..41cf6b5344fc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,7 +1321,7 @@ self: super: with self; { basemap-data = callPackage ../development/python-modules/basemap-data { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { }; + bash-kernel = callPackage ../development/python-modules/bash-kernel { }; bashlex = callPackage ../development/python-modules/bashlex { }; @@ -1573,6 +1573,8 @@ self: super: with self; { enablePython = true; }); + bork = callPackage ../development/python-modules/bork { }; + boschshcpy = callPackage ../development/python-modules/boschshcpy { }; bottombar = callPackage ../development/python-modules/bottombar { }; @@ -3787,6 +3789,8 @@ self: super: with self; { farama-notifications = callPackage ../development/python-modules/farama-notifications { }; + farm-haystack = callPackage ../development/python-modules/farm-haystack { }; + fastai = callPackage ../development/python-modules/fastai { }; fastapi = callPackage ../development/python-modules/fastapi { }; @@ -4156,7 +4160,9 @@ self: super: with self; { oelint-parser = callPackage ../development/python-modules/oelint-parser { }; - openllm = callPackage ../development/python-modules/openllm { }; + openllm = callPackage ../development/python-modules/openllm { + openai-triton = self.openai-triton-cuda; + }; openllm-client = callPackage ../development/python-modules/openllm-client { }; @@ -5090,6 +5096,8 @@ self: super: with self; { htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + htmllistparse = callPackage ../development/python-modules/htmllistparse { }; + htmlmin = callPackage ../development/python-modules/htmlmin { }; html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; @@ -5426,6 +5434,8 @@ self: super: with self; { ionhash = callPackage ../development/python-modules/ionhash { }; + ionoscloud = callPackage ../development/python-modules/ionoscloud { }; + iopath = callPackage ../development/python-modules/iopath { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; @@ -5813,8 +5823,6 @@ self: super: with self; { jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; - jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; @@ -5847,6 +5855,8 @@ self: super: with self; { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + jwt = callPackage ../development/python-modules/jwt { }; + jxmlease = callPackage ../development/python-modules/jxmlease { }; k-diffusion = callPackage ../development/python-modules/k-diffusion { }; @@ -6040,9 +6050,9 @@ self: super: with self; { layoutparser = callPackage ../development/python-modules/layoutparser { }; - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; @@ -6140,6 +6150,10 @@ self: super: with self; { pythonSupport = true; }); + libfive = toPythonModule (pkgs.libfive.override { + inherit python; + }); + libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; }; @@ -6322,7 +6336,7 @@ self: super: with self; { lineedit = callPackage ../development/python-modules/lineedit { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + line-profiler = callPackage ../development/python-modules/line-profiler { }; linetable = callPackage ../development/python-modules/linetable { }; @@ -6656,8 +6670,7 @@ self: super: with self; { maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit buildPythonPackage pythonOlder; - inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; + inherit (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; }; mbddns = callPackage ../development/python-modules/mbddns { }; @@ -7099,7 +7112,7 @@ self: super: with self; { multidict = callPackage ../development/python-modules/multidict { }; - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multi-key-dict = callPackage ../development/python-modules/multi-key-dict { }; multimethod = callPackage ../development/python-modules/multimethod { }; @@ -8272,8 +8285,6 @@ self: super: with self; { nxt-python = callPackage ../development/python-modules/nxt-python { }; - python-jwt = callPackage ../development/python-modules/python-jwt { }; - python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -8423,12 +8434,24 @@ self: super: with self; { open-meteo = callPackage ../development/python-modules/open-meteo { }; - openai-triton = callPackage ../development/python-modules/openai-triton { cudaPackages = pkgs.cudaPackages_12_0; }; + openai-triton = callPackage ../development/python-modules/openai-triton { + llvm = pkgs.openai-triton-llvm; + cudaPackages = pkgs.cudaPackages_12_0; + }; + + openai-triton-cuda = self.openai-triton.override { + cudaSupport = true; + }; + + openai-triton-no-cuda = self.openai-triton.override { + cudaSupport = false; + }; openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; openai-whisper = callPackage ../development/python-modules/openai-whisper { inherit (pkgs.config) cudaSupport; + openai-triton = self.openai-triton-cuda; }; openant = callPackage ../development/python-modules/openant { }; @@ -10389,10 +10412,6 @@ self: super: with self; { pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - pymaging = callPackage ../development/python-modules/pymaging { }; - - pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - pymailgunner = callPackage ../development/python-modules/pymailgunner { }; pymanopt = callPackage ../development/python-modules/pymanopt { }; @@ -11674,6 +11693,8 @@ self: super: with self; { pytricia = callPackage ../development/python-modules/pytricia { }; + pytrydan = callPackage ../development/python-modules/pytrydan { }; + pyttsx3 = callPackage ../development/python-modules/pyttsx3 { }; pytube = callPackage ../development/python-modules/pytube { }; @@ -12014,7 +12035,7 @@ self: super: with self; { rangehttpserver = callPackage ../development/python-modules/rangehttpserver { }; - rank_bm25 = callPackage ../development/python-modules/rank_bm25 { }; + rank-bm25 = callPackage ../development/python-modules/rank-bm25 { }; rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; @@ -12751,7 +12772,7 @@ self: super: with self; { setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; - setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; + setuptools-trial = callPackage ../development/python-modules/setuptools-trial { }; seventeentrack = callPackage ../development/python-modules/seventeentrack { }; @@ -13675,6 +13696,8 @@ self: super: with self; { telfhash = callPackage ../development/python-modules/telfhash { }; + telegram-text = callPackage ../development/python-modules/telegram-text { }; + temescal = callPackage ../development/python-modules/temescal { }; temperusb = callPackage ../development/python-modules/temperusb { }; @@ -14060,6 +14083,7 @@ self: super: with self; { torchWithCuda = self.torch.override { magma = pkgs.magma-cuda-static; + openai-triton = self.openai-triton-cuda; cudaSupport = true; rocmSupport = false; }; @@ -14070,6 +14094,7 @@ self: super: with self; { torchWithRocm = self.torch.override { magma = pkgs.magma-hip; + openai-triton = self.openai-triton-no-cuda; rocmSupport = true; cudaSupport = false; }; @@ -14112,7 +14137,7 @@ self: super: with self; { torpy = callPackage ../development/python-modules/torpy { }; - torrent_parser = callPackage ../development/python-modules/torrent_parser { }; + torrent-parser = callPackage ../development/python-modules/torrent-parser { }; torrequest = callPackage ../development/python-modules/torrequest { }; @@ -15134,6 +15159,8 @@ self: super: with self; { uasiren = callPackage ../development/python-modules/uasiren { }; + ubelt = callPackage ../development/python-modules/ubelt { }; + uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; ucsmsdk = callPackage ../development/python-modules/ucsmsdk { }; @@ -15764,11 +15791,15 @@ self: super: with self; { xdis = callPackage ../development/python-modules/xdis { }; + xdoctest = callPackage ../development/python-modules/xdoctest { }; + xdot = callPackage ../development/python-modules/xdot { inherit (pkgs) graphviz; }; - xformers = callPackage ../development/python-modules/xformers { }; + xformers = callPackage ../development/python-modules/xformers { + openai-triton = self.openai-triton-cuda; + }; xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; @@ -15976,6 +16007,8 @@ self: super: with self; { zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + zcbor = callPackage ../development/python-modules/zcbor { }; + zconfig = callPackage ../development/python-modules/zconfig { }; zcs = callPackage ../development/python-modules/zcs { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index ec2a1b1f71940..d675c86797dbd 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -7,13 +7,19 @@ { lib -, pkgs -, qt5 +, __splicedPackages +, makeScopeWithSplicing' +, generateSplicesForMkScope }: -(lib.makeScope pkgs.newScope ( self: - let + pkgs = __splicedPackages; + qt5 = __splicedPackages.qt5; +in + +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "libsForQt5"; + f = (self: let libsForQt5 = self; callPackage = self.callPackage; @@ -59,7 +65,9 @@ let }; in (lib.makeOverridable mkMaui attrs); -in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + +in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5; @@ -250,4 +258,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; yuview = callPackage ../applications/video/yuview { }; -}))) +}) // lib.optionalAttrs pkgs.config.allowAliases { + # remove after 23.11 branch-off and backport removal to 23.11 + # 23.11 will have a warning for this in `makeScope` itself + overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; +})); +} diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d55eef8d04127..4da9f03952af0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -487,7 +487,7 @@ let cabal-install = lib.subtractLists [ compilerNames.ghc981 ] released; - Cabal_3_10_1_0 = lib.subtractLists [ + Cabal_3_10_2_0 = lib.subtractLists [ compilerNames.ghc981 ] released; Cabal-syntax_3_10_1_0 = lib.subtractLists [ |